diff options
Diffstat (limited to 'intern/cycles/blender')
23 files changed, 94 insertions, 91 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index a0442b3394b..d948f2b3118 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -69,7 +69,8 @@ set(LIB cycles_device cycles_graph cycles_kernel - cycles_render + cycles_scene + cycles_session cycles_subd cycles_util diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index 52acc2573f5..670e25841f5 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "render/camera.h" -#include "render/scene.h" +#include "scene/camera.h" +#include "scene/scene.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index b6b4f206620..84333faaa23 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -14,16 +14,17 @@ * limitations under the License. */ -#include "render/attribute.h" -#include "render/camera.h" -#include "render/curves.h" -#include "render/hair.h" -#include "render/object.h" -#include "render/scene.h" +#include "scene/attribute.h" +#include "scene/camera.h" +#include "scene/curves.h" +#include "scene/hair.h" +#include "scene/object.h" +#include "scene/scene.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" +#include "util/util_color.h" #include "util/util_foreach.h" #include "util/util_hash.h" #include "util/util_logging.h" diff --git a/intern/cycles/blender/blender_display_driver.h b/intern/cycles/blender/blender_display_driver.h index 5e7e9b01065..800d0791041 100644 --- a/intern/cycles/blender/blender_display_driver.h +++ b/intern/cycles/blender/blender_display_driver.h @@ -22,7 +22,7 @@ #include "RNA_blender_cpp.h" -#include "render/display_driver.h" +#include "session/display_driver.h" #include "util/util_thread.h" #include "util/util_unique_ptr.h" diff --git a/intern/cycles/blender/blender_geometry.cpp b/intern/cycles/blender/blender_geometry.cpp index 7b49bb7fbb7..b4b0d04d104 100644 --- a/intern/cycles/blender/blender_geometry.cpp +++ b/intern/cycles/blender/blender_geometry.cpp @@ -15,11 +15,11 @@ * limitations under the License. */ -#include "render/curves.h" -#include "render/hair.h" -#include "render/mesh.h" -#include "render/object.h" -#include "render/volume.h" +#include "scene/curves.h" +#include "scene/hair.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/volume.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_id_map.h b/intern/cycles/blender/blender_id_map.h index 198cfb4b29a..27a53a90f12 100644 --- a/intern/cycles/blender/blender_id_map.h +++ b/intern/cycles/blender/blender_id_map.h @@ -19,8 +19,8 @@ #include <string.h> -#include "render/geometry.h" -#include "render/scene.h" +#include "scene/geometry.h" +#include "scene/scene.h" #include "util/util_map.h" #include "util/util_set.h" diff --git a/intern/cycles/blender/blender_image.h b/intern/cycles/blender/blender_image.h index fddbbfd9c37..6f1e72c21af 100644 --- a/intern/cycles/blender/blender_image.h +++ b/intern/cycles/blender/blender_image.h @@ -19,7 +19,7 @@ #include "RNA_blender_cpp.h" -#include "render/image.h" +#include "scene/image.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_light.cpp b/intern/cycles/blender/blender_light.cpp index 4df1e720dde..aa0c6a964e4 100644 --- a/intern/cycles/blender/blender_light.cpp +++ b/intern/cycles/blender/blender_light.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "render/light.h" +#include "scene/light.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 7ec430eb7fe..992e17d6f79 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "render/camera.h" -#include "render/colorspace.h" -#include "render/mesh.h" -#include "render/object.h" -#include "render/scene.h" +#include "scene/camera.h" +#include "scene/colorspace.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/scene.h" #include "blender/blender_session.h" #include "blender/blender_sync.h" @@ -28,6 +28,7 @@ #include "subd/subd_split.h" #include "util/util_algorithm.h" +#include "util/util_color.h" #include "util/util_disjoint_set.h" #include "util/util_foreach.h" #include "util/util_hash.h" diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 4b1c4edef7e..75311805fd8 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "render/alembic.h" -#include "render/camera.h" -#include "render/graph.h" -#include "render/integrator.h" -#include "render/light.h" -#include "render/mesh.h" -#include "render/nodes.h" -#include "render/object.h" -#include "render/particles.h" -#include "render/scene.h" -#include "render/shader.h" +#include "scene/alembic.h" +#include "scene/camera.h" +#include "scene/integrator.h" +#include "scene/light.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/particles.h" +#include "scene/scene.h" +#include "scene/shader.h" +#include "scene/shader_graph.h" +#include "scene/shader_nodes.h" #include "blender/blender_object_cull.h" #include "blender/blender_sync.h" diff --git a/intern/cycles/blender/blender_object_cull.cpp b/intern/cycles/blender/blender_object_cull.cpp index cb7827b3c4a..34cceb5a6e4 100644 --- a/intern/cycles/blender/blender_object_cull.cpp +++ b/intern/cycles/blender/blender_object_cull.cpp @@ -16,7 +16,7 @@ #include <cstdlib> -#include "render/camera.h" +#include "scene/camera.h" #include "blender/blender_object_cull.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_output_driver.h b/intern/cycles/blender/blender_output_driver.h index 0852cba1b34..1d016f8bcb9 100644 --- a/intern/cycles/blender/blender_output_driver.h +++ b/intern/cycles/blender/blender_output_driver.h @@ -20,7 +20,7 @@ #include "RNA_blender_cpp.h" -#include "render/output_driver.h" +#include "session/output_driver.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/blender_particles.cpp index 206ee24a093..f654998af62 100644 --- a/intern/cycles/blender/blender_particles.cpp +++ b/intern/cycles/blender/blender_particles.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "render/mesh.h" -#include "render/object.h" -#include "render/particles.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/particles.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index d681517c9e1..45e5394cf34 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -23,8 +23,8 @@ #include "blender/blender_sync.h" #include "blender/blender_util.h" -#include "render/denoising.h" -#include "render/merge.h" +#include "session/denoising.h" +#include "session/merge.h" #include "util/util_debug.h" #include "util/util_foreach.h" @@ -39,7 +39,7 @@ #include "util/util_types.h" #ifdef WITH_OSL -# include "render/osl.h" +# include "scene/osl.h" # include <OSL/oslconfig.h> # include <OSL/oslquery.h> diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 0b4b5c60def..988a8159864 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -17,19 +17,19 @@ #include <stdlib.h> #include "device/device.h" -#include "render/background.h" -#include "render/buffers.h" -#include "render/camera.h" -#include "render/colorspace.h" -#include "render/film.h" -#include "render/integrator.h" -#include "render/light.h" -#include "render/mesh.h" -#include "render/object.h" -#include "render/scene.h" -#include "render/session.h" -#include "render/shader.h" -#include "render/stats.h" +#include "scene/background.h" +#include "scene/camera.h" +#include "scene/colorspace.h" +#include "scene/film.h" +#include "scene/integrator.h" +#include "scene/light.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/scene.h" +#include "scene/shader.h" +#include "scene/stats.h" +#include "session/buffers.h" +#include "session/session.h" #include "util/util_algorithm.h" #include "util/util_color.h" diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index 7d3be5f8054..9bc685ec306 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -21,9 +21,9 @@ #include "device/device.h" -#include "render/bake.h" -#include "render/scene.h" -#include "render/session.h" +#include "scene/bake.h" +#include "scene/scene.h" +#include "session/session.h" #include "util/util_vector.h" diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 25e7ec71577..8d3bbb520c8 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "render/background.h" -#include "render/colorspace.h" -#include "render/graph.h" -#include "render/integrator.h" -#include "render/light.h" -#include "render/nodes.h" -#include "render/osl.h" -#include "render/scene.h" -#include "render/shader.h" +#include "scene/background.h" +#include "scene/colorspace.h" +#include "scene/integrator.h" +#include "scene/light.h" +#include "scene/osl.h" +#include "scene/scene.h" +#include "scene/shader.h" +#include "scene/shader_graph.h" +#include "scene/shader_nodes.h" #include "blender/blender_image.h" #include "blender/blender_sync.h" diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index e0a809b9307..1725ea5ec93 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -14,19 +14,19 @@ * limitations under the License. */ -#include "render/background.h" -#include "render/camera.h" -#include "render/curves.h" -#include "render/film.h" -#include "render/graph.h" -#include "render/integrator.h" -#include "render/light.h" -#include "render/mesh.h" -#include "render/nodes.h" -#include "render/object.h" -#include "render/procedural.h" -#include "render/scene.h" -#include "render/shader.h" +#include "scene/background.h" +#include "scene/camera.h" +#include "scene/curves.h" +#include "scene/film.h" +#include "scene/integrator.h" +#include "scene/light.h" +#include "scene/mesh.h" +#include "scene/object.h" +#include "scene/procedural.h" +#include "scene/scene.h" +#include "scene/shader.h" +#include "scene/shader_graph.h" +#include "scene/shader_nodes.h" #include "device/device.h" diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 786479ac0f8..99e3f0bf02b 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -26,8 +26,8 @@ #include "blender/blender_util.h" #include "blender/blender_viewport.h" -#include "render/scene.h" -#include "render/session.h" +#include "scene/scene.h" +#include "session/session.h" #include "util/util_map.h" #include "util/util_set.h" diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 77b2bd5ac4f..a3dd2349525 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -17,7 +17,7 @@ #ifndef __BLENDER_UTIL_H__ #define __BLENDER_UTIL_H__ -#include "render/mesh.h" +#include "scene/mesh.h" #include "util/util_algorithm.h" #include "util/util_array.h" diff --git a/intern/cycles/blender/blender_viewport.cpp b/intern/cycles/blender/blender_viewport.cpp index 62e32240bba..b8deb77b621 100644 --- a/intern/cycles/blender/blender_viewport.cpp +++ b/intern/cycles/blender/blender_viewport.cpp @@ -17,7 +17,7 @@ #include "blender_viewport.h" #include "blender_util.h" -#include "render/pass.h" +#include "scene/pass.h" #include "util/util_logging.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_viewport.h b/intern/cycles/blender/blender_viewport.h index b5adafc30c9..a445973f4d2 100644 --- a/intern/cycles/blender/blender_viewport.h +++ b/intern/cycles/blender/blender_viewport.h @@ -23,7 +23,7 @@ #include "RNA_blender_cpp.h" #include "RNA_types.h" -#include "render/film.h" +#include "scene/film.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_volume.cpp b/intern/cycles/blender/blender_volume.cpp index 0a5b19d7d4c..46083cb29dd 100644 --- a/intern/cycles/blender/blender_volume.cpp +++ b/intern/cycles/blender/blender_volume.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "render/colorspace.h" -#include "render/image.h" -#include "render/image_vdb.h" -#include "render/object.h" -#include "render/volume.h" +#include "scene/colorspace.h" +#include "scene/image.h" +#include "scene/image_vdb.h" +#include "scene/object.h" +#include "scene/volume.h" #include "blender/blender_sync.h" #include "blender/blender_util.h" |