appleseedhq · oktomus · May 30, 2019 · Mar 22, 2020 · Mar 22, 2020 · Mar 22, 2020
diff --git a/...x/icons/lightpathstab_next_light_path.png → ...ns/lightpaths_toolbar_next_light_path.png b/...x/icons/lightpathstab_next_light_path.png → ...ns/lightpaths_toolbar_next_light_path.png
diff --git a/...ightpathstab_next_light_path_disabled.png → ...aths_toolbar_next_light_path_disabled.png b/...ightpathstab_next_light_path_disabled.png → ...aths_toolbar_next_light_path_disabled.png
diff --git a/...s/lightpathstab_next_light_path_hover.png → ...htpaths_toolbar_next_light_path_hover.png b/...s/lightpathstab_next_light_path_hover.png → ...htpaths_toolbar_next_light_path_hover.png
diff --git a/...x/icons/lightpathstab_prev_light_path.png → ...ns/lightpaths_toolbar_prev_light_path.png b/...x/icons/lightpathstab_prev_light_path.png → ...ns/lightpaths_toolbar_prev_light_path.png
diff --git a/...ightpathstab_prev_light_path_disabled.png → ...aths_toolbar_prev_light_path_disabled.png b/...ightpathstab_prev_light_path_disabled.png → ...aths_toolbar_prev_light_path_disabled.png
diff --git a/...s/lightpathstab_prev_light_path_hover.png → ...htpaths_toolbar_prev_light_path_hover.png b/...s/lightpathstab_prev_light_path_hover.png → ...htpaths_toolbar_prev_light_path_hover.png
diff --git a/.../icons/lightpathstab_save_light_paths.png → ...s/lightpaths_toolbar_save_light_paths.png b/.../icons/lightpathstab_save_light_paths.png → ...s/lightpaths_toolbar_save_light_paths.png
diff --git a/...ghtpathstab_save_light_paths_disabled.png → ...ths_toolbar_save_light_paths_disabled.png b/...ghtpathstab_save_light_paths_disabled.png → ...ths_toolbar_save_light_paths_disabled.png
diff --git a/.../lightpathstab_save_light_paths_hover.png → ...tpaths_toolbar_save_light_paths_hover.png b/.../lightpathstab_save_light_paths_hover.png → ...tpaths_toolbar_save_light_paths_hover.png
diff --git a/...cons/lightpathstab_synchronize_camera.png → ...pengl_viewport_tab_synchronize_camera.png b/...cons/lightpathstab_synchronize_camera.png → ...pengl_viewport_tab_synchronize_camera.png
diff --git a/...ightpathstab_synchronize_camera_hover.png → ...viewport_tab_synchronize_camera_hover.png b/...ightpathstab_synchronize_camera_hover.png → ...viewport_tab_synchronize_camera_hover.png
diff --git a/...lightpathstab_toggle_backface_culling.png → ..._viewport_tab_toggle_backface_culling.png b/...lightpathstab_toggle_backface_culling.png → ..._viewport_tab_toggle_backface_culling.png
diff --git a/...athstab_toggle_backface_culling_hover.png → ...ort_tab_toggle_backface_culling_hover.png b/...athstab_toggle_backface_culling_hover.png → ...ort_tab_toggle_backface_culling_hover.png
diff --git a/src/appleseed.studio/CMakeLists.txt b/src/appleseed.studio/CMakeLists.txt
@@ -252,14 +252,22 @@ source_group ("mainwindow\\pythonconsole" FILES
 set (mainwindow_rendering_sources
     mainwindow/rendering/cameracontroller.cpp
     mainwindow/rendering/cameracontroller.h
+    mainwindow/rendering/finalrenderviewporttab.cpp
+    mainwindow/rendering/finalrenderviewporttab.h
+    mainwindow/rendering/glscenelayer.cpp
+    mainwindow/rendering/glscenelayer.h
+    mainwindow/rendering/lightpathslayer.cpp
+    mainwindow/rendering/lightpathslayer.h
+    mainwindow/rendering/lightpathsmanager.cpp
+    mainwindow/rendering/lightpathsmanager.h
     mainwindow/rendering/lightpathspickinghandler.cpp
     mainwindow/rendering/lightpathspickinghandler.h
-    mainwindow/rendering/lightpathstab.cpp
-    mainwindow/rendering/lightpathstab.h
-    mainwindow/rendering/lightpathswidget.cpp
-    mainwindow/rendering/lightpathswidget.h
+    mainwindow/rendering/lightpathsviewporttoolbar.cpp
+    mainwindow/rendering/lightpathsviewporttoolbar.h
     mainwindow/rendering/materialdrophandler.cpp
     mainwindow/rendering/materialdrophandler.h
+    mainwindow/rendering/openglviewporttab.cpp
+    mainwindow/rendering/openglviewporttab.h
     mainwindow/rendering/pixelcolortracker.cpp
     mainwindow/rendering/pixelcolortracker.h
     mainwindow/rendering/pixelinspectorhandler.cpp
@@ -272,14 +280,16 @@ set (mainwindow_rendering_sources
     mainwindow/rendering/renderclipboardhandler.h
     mainwindow/rendering/renderingmanager.cpp
     mainwindow/rendering/renderingmanager.h
-    mainwindow/rendering/renderregionhandler.cpp
-    mainwindow/rendering/renderregionhandler.h
-    mainwindow/rendering/rendertab.cpp
-    mainwindow/rendering/rendertab.h
-    mainwindow/rendering/renderwidget.cpp
-    mainwindow/rendering/renderwidget.h
+    mainwindow/rendering/renderlayer.cpp
+    mainwindow/rendering/renderlayer.h
     mainwindow/rendering/scenepickinghandler.cpp
     mainwindow/rendering/scenepickinghandler.h
+    mainwindow/rendering/viewportcanvas.cpp
+    mainwindow/rendering/viewportcanvas.h
+    mainwindow/rendering/viewportregionselectionhandler.cpp
+    mainwindow/rendering/viewportregionselectionhandler.h
+    mainwindow/rendering/viewporttab.cpp
+    mainwindow/rendering/viewporttab.h
 )
 list (APPEND appleseed.studio_sources
     ${mainwindow_rendering_sources}
@@ -343,6 +353,8 @@ source_group ("python\\studio" FILES
 )
 
 set (utility_sources
+    utility/gl.cpp
+    utility/gl.h
     utility/inputwidgetproxies.cpp
     utility/inputwidgetproxies.h
     utility/settingskeys.h

diff --git a/src/appleseed.studio/main/main.cpp b/src/appleseed.studio/main/main.cpp
@@ -332,7 +332,7 @@ int main(int argc, char* argv[])
     // Set default surface format before creating application instance. This is
     // required on macOS in order to use an OpenGL Core profile context.
     QSurfaceFormat default_format;
-    default_format.setVersion(3, 3);
+    default_format.setVersion(4, 2);
     default_format.setProfile(QSurfaceFormat::CoreProfile);
     QSurfaceFormat::setDefaultFormat(default_format);