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.

6 files changed, 18 insertions, 18 deletions

diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt
index 8cc72359757..f7e47a8764d 100644
--- a/intern/cycles/bvh/CMakeLists.txt
+++ b/intern/cycles/bvh/CMakeLists.txt
@@ -49,7 +49,7 @@ set(SRC_HEADERS
 )
 
 set(LIB
-  cycles_render
+  cycles_scene
   cycles_util
 )
 
diff --git a/intern/cycles/bvh/bvh2.cpp b/intern/cycles/bvh/bvh2.cpp
index 4a90a1e8796..3b864859f31 100644
--- a/intern/cycles/bvh/bvh2.cpp
+++ b/intern/cycles/bvh/bvh2.cpp
@@ -17,9 +17,9 @@
 
 #include "bvh/bvh2.h"
 
-#include "render/hair.h"
-#include "render/mesh.h"
-#include "render/object.h"
+#include "scene/hair.h"
+#include "scene/mesh.h"
+#include "scene/object.h"
 
 #include "bvh/bvh_build.h"
 #include "bvh/bvh_node.h"
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp
index 025a103d6f8..9ae40b57bc3 100644
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@ -22,11 +22,11 @@
 #include "bvh/bvh_params.h"
 #include "bvh_split.h"
 
-#include "render/curves.h"
-#include "render/hair.h"
-#include "render/mesh.h"
-#include "render/object.h"
-#include "render/scene.h"
+#include "scene/curves.h"
+#include "scene/hair.h"
+#include "scene/mesh.h"
+#include "scene/object.h"
+#include "scene/scene.h"
 
 #include "util/util_algorithm.h"
 #include "util/util_foreach.h"
diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
index cd19e009bf3..59a72f27294 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -40,11 +40,11 @@
 #  include "kernel/bvh/bvh_util.h"
 #  include "kernel/device/cpu/compat.h"
 #  include "kernel/device/cpu/globals.h"
-#  include "kernel/kernel_random.h"
+#  include "kernel/sample/sample_lcg.h"
 
-#  include "render/hair.h"
-#  include "render/mesh.h"
-#  include "render/object.h"
+#  include "scene/hair.h"
+#  include "scene/mesh.h"
+#  include "scene/object.h"
 
 #  include "util/util_foreach.h"
 #  include "util/util_logging.h"
diff --git a/intern/cycles/bvh/bvh_split.cpp b/intern/cycles/bvh/bvh_split.cpp
index d4c79253834..0e7d36983e7 100644
--- a/intern/cycles/bvh/bvh_split.cpp
+++ b/intern/cycles/bvh/bvh_split.cpp
@@ -20,9 +20,9 @@
 #include "bvh/bvh_build.h"
 #include "bvh/bvh_sort.h"
 
-#include "render/hair.h"
-#include "render/mesh.h"
-#include "render/object.h"
+#include "scene/hair.h"
+#include "scene/mesh.h"
+#include "scene/object.h"
 
 #include "util/util_algorithm.h"
 
diff --git a/intern/cycles/bvh/bvh_unaligned.cpp b/intern/cycles/bvh/bvh_unaligned.cpp
index 38e55307848..ce95aa7aa74 100644
--- a/intern/cycles/bvh/bvh_unaligned.cpp
+++ b/intern/cycles/bvh/bvh_unaligned.cpp
@@ -16,8 +16,8 @@
 
 #include "bvh/bvh_unaligned.h"
 
-#include "render/hair.h"
-#include "render/object.h"
+#include "scene/hair.h"
+#include "scene/object.h"
 
 #include "bvh/bvh_binning.h"
 #include "bvh_params.h"