Cycles: changes to source code folders structure

* Split render/ into scene/ and session/. The scene/ folder now contains the
  scene and its nodes. The session/ folder contains the render session and
  associated data structures like drivers and render buffers.
* Move top level kernel headers into new folders kernel/camera/, kernel/film/,
  kernel/light/, kernel/sample/, kernel/util/
* Move integrator related kernel headers into kernel/integrator/
* Move OSL shaders from kernel/shaders/ to kernel/osl/shaders/

For patches and branches, git merge and rebase should be able to detect the
renames and move over code to the right file.

2 files changed, 7 insertions, 6 deletions

diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index 0f6b435813f..efd9cecb877 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -25,18 +25,19 @@ set(INC
   ../device
   ../graph
   ../kernel
-  ../render
+  ../scene
   ../util
 )
 
 set(ALL_CYCLES_LIBRARIES
-  cycles_device
   cycles_kernel
   cycles_integrator
-  cycles_render
+  cycles_scene
+  cycles_session
   cycles_bvh
   cycles_graph
   cycles_subd
+  cycles_device
   cycles_util
   extern_clew
   ${CYCLES_GL_LIBRARIES}
diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp
index 19c211fe5f7..4a87a382130 100644
--- a/intern/cycles/test/render_graph_finalize_test.cpp
+++ b/intern/cycles/test/render_graph_finalize_test.cpp
@@ -19,9 +19,9 @@
 
 #include "device/device.h"
 
-#include "render/graph.h"
-#include "render/nodes.h"
-#include "render/scene.h"
+#include "scene/scene.h"
+#include "scene/shader_graph.h"
+#include "scene/shader_nodes.h"
 
 #include "util/util_array.h"
 #include "util/util_logging.h"