diff options
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 62 | ||||
-rw-r--r-- | intern/cycles/blender/camera.cpp (renamed from intern/cycles/blender/blender_camera.cpp) | 6 | ||||
-rw-r--r-- | intern/cycles/blender/curves.cpp (renamed from intern/cycles/blender/blender_curves.cpp) | 14 | ||||
-rw-r--r-- | intern/cycles/blender/device.cpp (renamed from intern/cycles/blender/blender_device.cpp) | 8 | ||||
-rw-r--r-- | intern/cycles/blender/device.h (renamed from intern/cycles/blender/blender_device.h) | 0 | ||||
-rw-r--r-- | intern/cycles/blender/display_driver.cpp (renamed from intern/cycles/blender/blender_display_driver.cpp) | 6 | ||||
-rw-r--r-- | intern/cycles/blender/display_driver.h (renamed from intern/cycles/blender/blender_display_driver.h) | 4 | ||||
-rw-r--r-- | intern/cycles/blender/geometry.cpp (renamed from intern/cycles/blender/blender_geometry.cpp) | 8 | ||||
-rw-r--r-- | intern/cycles/blender/id_map.h (renamed from intern/cycles/blender/blender_id_map.h) | 6 | ||||
-rw-r--r-- | intern/cycles/blender/image.cpp (renamed from intern/cycles/blender/blender_image.cpp) | 6 | ||||
-rw-r--r-- | intern/cycles/blender/image.h (renamed from intern/cycles/blender/blender_image.h) | 0 | ||||
-rw-r--r-- | intern/cycles/blender/light.cpp (renamed from intern/cycles/blender/blender_light.cpp) | 6 | ||||
-rw-r--r-- | intern/cycles/blender/logging.cpp (renamed from intern/cycles/blender/blender_logging.cpp) | 2 | ||||
-rw-r--r-- | intern/cycles/blender/mesh.cpp (renamed from intern/cycles/blender/blender_mesh.cpp) | 26 | ||||
-rw-r--r-- | intern/cycles/blender/object.cpp (renamed from intern/cycles/blender/blender_object.cpp) | 16 | ||||
-rw-r--r-- | intern/cycles/blender/object_cull.cpp (renamed from intern/cycles/blender/blender_object_cull.cpp) | 4 | ||||
-rw-r--r-- | intern/cycles/blender/object_cull.h (renamed from intern/cycles/blender/blender_object_cull.h) | 4 | ||||
-rw-r--r-- | intern/cycles/blender/output_driver.cpp (renamed from intern/cycles/blender/blender_output_driver.cpp) | 2 | ||||
-rw-r--r-- | intern/cycles/blender/output_driver.h (renamed from intern/cycles/blender/blender_output_driver.h) | 0 | ||||
-rw-r--r-- | intern/cycles/blender/particles.cpp (renamed from intern/cycles/blender/blender_particles.cpp) | 8 | ||||
-rw-r--r-- | intern/cycles/blender/python.cpp (renamed from intern/cycles/blender/blender_python.cpp) | 30 | ||||
-rw-r--r-- | intern/cycles/blender/session.cpp (renamed from intern/cycles/blender/blender_session.cpp) | 32 | ||||
-rw-r--r-- | intern/cycles/blender/session.h (renamed from intern/cycles/blender/blender_session.h) | 4 | ||||
-rw-r--r-- | intern/cycles/blender/shader.cpp (renamed from intern/cycles/blender/blender_shader.cpp) | 20 | ||||
-rw-r--r-- | intern/cycles/blender/sync.cpp (renamed from intern/cycles/blender/blender_sync.cpp) | 22 | ||||
-rw-r--r-- | intern/cycles/blender/sync.h (renamed from intern/cycles/blender/blender_sync.h) | 14 | ||||
-rw-r--r-- | intern/cycles/blender/texture.cpp (renamed from intern/cycles/blender/blender_texture.cpp) | 2 | ||||
-rw-r--r-- | intern/cycles/blender/texture.h (renamed from intern/cycles/blender/blender_texture.h) | 2 | ||||
-rw-r--r-- | intern/cycles/blender/util.h (renamed from intern/cycles/blender/blender_util.h) | 16 | ||||
-rw-r--r-- | intern/cycles/blender/viewport.cpp (renamed from intern/cycles/blender/blender_viewport.cpp) | 7 | ||||
-rw-r--r-- | intern/cycles/blender/viewport.h (renamed from intern/cycles/blender/blender_viewport.h) | 0 | ||||
-rw-r--r-- | intern/cycles/blender/volume.cpp (renamed from intern/cycles/blender/blender_volume.cpp) | 6 |
32 files changed, 173 insertions, 170 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index d948f2b3118..149967ad331 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -29,39 +29,39 @@ set(INC_SYS ) set(SRC - blender_camera.cpp - blender_device.cpp - blender_display_driver.cpp - blender_image.cpp - blender_geometry.cpp - blender_light.cpp - blender_mesh.cpp - blender_object.cpp - blender_object_cull.cpp - blender_output_driver.cpp - blender_particles.cpp - blender_curves.cpp - blender_logging.cpp - blender_python.cpp - blender_session.cpp - blender_shader.cpp - blender_sync.cpp - blender_texture.cpp - blender_viewport.cpp - blender_volume.cpp + camera.cpp + device.cpp + display_driver.cpp + image.cpp + geometry.cpp + light.cpp + mesh.cpp + object.cpp + object_cull.cpp + output_driver.cpp + particles.cpp + curves.cpp + logging.cpp + python.cpp + session.cpp + shader.cpp + sync.cpp + texture.cpp + viewport.cpp + volume.cpp CCL_api.h - blender_device.h - blender_display_driver.h - blender_id_map.h - blender_image.h - blender_object_cull.h - blender_output_driver.h - blender_sync.h - blender_session.h - blender_texture.h - blender_util.h - blender_viewport.h + device.h + display_driver.h + id_map.h + image.h + object_cull.h + output_driver.h + sync.h + session.h + texture.h + util.h + viewport.h ) set(LIB diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/camera.cpp index 670e25841f5..f87ebe39d21 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/camera.cpp @@ -17,10 +17,10 @@ #include "scene/camera.h" #include "scene/scene.h" -#include "blender/blender_sync.h" -#include "blender/blender_util.h" +#include "blender/sync.h" +#include "blender/util.h" -#include "util/util_logging.h" +#include "util/log.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/curves.cpp index 84333faaa23..fb2b329e61d 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/curves.cpp @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "blender/sync.h" +#include "blender/util.h" + #include "scene/attribute.h" #include "scene/camera.h" #include "scene/curves.h" @@ -21,13 +24,10 @@ #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" +#include "util/color.h" +#include "util/foreach.h" +#include "util/hash.h" +#include "util/log.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_device.cpp b/intern/cycles/blender/device.cpp index 7bed33855c2..9fabc33a96b 100644 --- a/intern/cycles/blender/blender_device.cpp +++ b/intern/cycles/blender/device.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "blender/blender_device.h" -#include "blender/blender_session.h" -#include "blender/blender_util.h" +#include "blender/device.h" +#include "blender/session.h" +#include "blender/util.h" -#include "util/util_foreach.h" +#include "util/foreach.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_device.h b/intern/cycles/blender/device.h index 8d2ecac7483..8d2ecac7483 100644 --- a/intern/cycles/blender/blender_device.h +++ b/intern/cycles/blender/device.h diff --git a/intern/cycles/blender/blender_display_driver.cpp b/intern/cycles/blender/display_driver.cpp index cdf175f91d0..d5f6d85251e 100644 --- a/intern/cycles/blender/blender_display_driver.cpp +++ b/intern/cycles/blender/display_driver.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "blender/blender_display_driver.h" +#include "blender/display_driver.h" #include "device/device.h" -#include "util/util_logging.h" -#include "util/util_opengl.h" +#include "util/log.h" +#include "util/opengl.h" extern "C" { struct RenderEngine; diff --git a/intern/cycles/blender/blender_display_driver.h b/intern/cycles/blender/display_driver.h index 800d0791041..66cfc8cffcc 100644 --- a/intern/cycles/blender/blender_display_driver.h +++ b/intern/cycles/blender/display_driver.h @@ -24,8 +24,8 @@ #include "session/display_driver.h" -#include "util/util_thread.h" -#include "util/util_unique_ptr.h" +#include "util/thread.h" +#include "util/unique_ptr.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_geometry.cpp b/intern/cycles/blender/geometry.cpp index b4b0d04d104..479e76f68bc 100644 --- a/intern/cycles/blender/blender_geometry.cpp +++ b/intern/cycles/blender/geometry.cpp @@ -21,11 +21,11 @@ #include "scene/object.h" #include "scene/volume.h" -#include "blender/blender_sync.h" -#include "blender/blender_util.h" +#include "blender/sync.h" +#include "blender/util.h" -#include "util/util_foreach.h" -#include "util/util_task.h" +#include "util/foreach.h" +#include "util/task.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_id_map.h b/intern/cycles/blender/id_map.h index 27a53a90f12..c1b800026c3 100644 --- a/intern/cycles/blender/blender_id_map.h +++ b/intern/cycles/blender/id_map.h @@ -22,9 +22,9 @@ #include "scene/geometry.h" #include "scene/scene.h" -#include "util/util_map.h" -#include "util/util_set.h" -#include "util/util_vector.h" +#include "util/map.h" +#include "util/set.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_image.cpp b/intern/cycles/blender/image.cpp index f27275bd457..3ea3a47c1f4 100644 --- a/intern/cycles/blender/blender_image.cpp +++ b/intern/cycles/blender/image.cpp @@ -16,9 +16,9 @@ #include "MEM_guardedalloc.h" -#include "blender/blender_image.h" -#include "blender/blender_session.h" -#include "blender/blender_util.h" +#include "blender/image.h" +#include "blender/session.h" +#include "blender/util.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_image.h b/intern/cycles/blender/image.h index 6f1e72c21af..6f1e72c21af 100644 --- a/intern/cycles/blender/blender_image.h +++ b/intern/cycles/blender/image.h diff --git a/intern/cycles/blender/blender_light.cpp b/intern/cycles/blender/light.cpp index aa0c6a964e4..1e4cc0f1d14 100644 --- a/intern/cycles/blender/blender_light.cpp +++ b/intern/cycles/blender/light.cpp @@ -18,10 +18,10 @@ #include "scene/light.h" -#include "blender/blender_sync.h" -#include "blender/blender_util.h" +#include "blender/sync.h" +#include "blender/util.h" -#include "util/util_hash.h" +#include "util/hash.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_logging.cpp b/intern/cycles/blender/logging.cpp index b42a1f47821..613b4084aa8 100644 --- a/intern/cycles/blender/blender_logging.cpp +++ b/intern/cycles/blender/logging.cpp @@ -15,7 +15,7 @@ */ #include "blender/CCL_api.h" -#include "util/util_logging.h" +#include "util/log.h" void CCL_init_logging(const char *argv0) { diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/mesh.cpp index 992e17d6f79..b69bf88c213 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/mesh.cpp @@ -14,26 +14,26 @@ * limitations under the License. */ +#include "blender/session.h" +#include "blender/sync.h" +#include "blender/util.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" -#include "blender/blender_util.h" - -#include "subd/subd_patch.h" -#include "subd/subd_split.h" +#include "subd/patch.h" +#include "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" -#include "util/util_logging.h" -#include "util/util_math.h" +#include "util/algorithm.h" +#include "util/color.h" +#include "util/disjoint_set.h" +#include "util/foreach.h" +#include "util/hash.h" +#include "util/log.h" +#include "util/math.h" #include "mikktspace.h" diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/object.cpp index 75311805fd8..9919b9d1836 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/object.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +#include "blender/object_cull.h" +#include "blender/sync.h" +#include "blender/util.h" + #include "scene/alembic.h" #include "scene/camera.h" #include "scene/integrator.h" @@ -26,14 +30,10 @@ #include "scene/shader_graph.h" #include "scene/shader_nodes.h" -#include "blender/blender_object_cull.h" -#include "blender/blender_sync.h" -#include "blender/blender_util.h" - -#include "util/util_foreach.h" -#include "util/util_hash.h" -#include "util/util_logging.h" -#include "util/util_task.h" +#include "util/foreach.h" +#include "util/hash.h" +#include "util/log.h" +#include "util/task.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_object_cull.cpp b/intern/cycles/blender/object_cull.cpp index 34cceb5a6e4..c2493be26dd 100644 --- a/intern/cycles/blender/blender_object_cull.cpp +++ b/intern/cycles/blender/object_cull.cpp @@ -18,8 +18,8 @@ #include "scene/camera.h" -#include "blender/blender_object_cull.h" -#include "blender/blender_util.h" +#include "blender/object_cull.h" +#include "blender/util.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_object_cull.h b/intern/cycles/blender/object_cull.h index 0879db4f802..be3068ef4e7 100644 --- a/intern/cycles/blender/blender_object_cull.h +++ b/intern/cycles/blender/object_cull.h @@ -17,8 +17,8 @@ #ifndef __BLENDER_OBJECT_CULL_H__ #define __BLENDER_OBJECT_CULL_H__ -#include "blender/blender_sync.h" -#include "util/util_types.h" +#include "blender/sync.h" +#include "util/types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_output_driver.cpp b/intern/cycles/blender/output_driver.cpp index 2f2844d4820..2b3586af668 100644 --- a/intern/cycles/blender/blender_output_driver.cpp +++ b/intern/cycles/blender/output_driver.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "blender/blender_output_driver.h" +#include "blender/output_driver.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_output_driver.h b/intern/cycles/blender/output_driver.h index 1d016f8bcb9..1d016f8bcb9 100644 --- a/intern/cycles/blender/blender_output_driver.h +++ b/intern/cycles/blender/output_driver.h diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/particles.cpp index f654998af62..3a2c1b0ecf9 100644 --- a/intern/cycles/blender/blender_particles.cpp +++ b/intern/cycles/blender/particles.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ +#include "scene/particles.h" #include "scene/mesh.h" #include "scene/object.h" -#include "scene/particles.h" -#include "blender/blender_sync.h" -#include "blender/blender_util.h" +#include "blender/sync.h" +#include "blender/util.h" -#include "util/util_foreach.h" +#include "util/foreach.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/python.cpp index 45e5394cf34..20bf6385999 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/python.cpp @@ -18,25 +18,25 @@ #include "blender/CCL_api.h" -#include "blender/blender_device.h" -#include "blender/blender_session.h" -#include "blender/blender_sync.h" -#include "blender/blender_util.h" +#include "blender/device.h" +#include "blender/session.h" +#include "blender/sync.h" +#include "blender/util.h" #include "session/denoising.h" #include "session/merge.h" -#include "util/util_debug.h" -#include "util/util_foreach.h" -#include "util/util_logging.h" -#include "util/util_md5.h" -#include "util/util_opengl.h" -#include "util/util_openimagedenoise.h" -#include "util/util_path.h" -#include "util/util_string.h" -#include "util/util_task.h" -#include "util/util_tbb.h" -#include "util/util_types.h" +#include "util/debug.h" +#include "util/foreach.h" +#include "util/log.h" +#include "util/md5.h" +#include "util/opengl.h" +#include "util/openimagedenoise.h" +#include "util/path.h" +#include "util/string.h" +#include "util/task.h" +#include "util/tbb.h" +#include "util/types.h" #ifdef WITH_OSL # include "scene/osl.h" diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/session.cpp index 988a8159864..d9a2d3d3029 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/session.cpp @@ -31,22 +31,22 @@ #include "session/buffers.h" #include "session/session.h" -#include "util/util_algorithm.h" -#include "util/util_color.h" -#include "util/util_foreach.h" -#include "util/util_function.h" -#include "util/util_hash.h" -#include "util/util_logging.h" -#include "util/util_murmurhash.h" -#include "util/util_path.h" -#include "util/util_progress.h" -#include "util/util_time.h" - -#include "blender/blender_display_driver.h" -#include "blender/blender_output_driver.h" -#include "blender/blender_session.h" -#include "blender/blender_sync.h" -#include "blender/blender_util.h" +#include "util/algorithm.h" +#include "util/color.h" +#include "util/foreach.h" +#include "util/function.h" +#include "util/hash.h" +#include "util/log.h" +#include "util/murmurhash.h" +#include "util/path.h" +#include "util/progress.h" +#include "util/time.h" + +#include "blender/display_driver.h" +#include "blender/output_driver.h" +#include "blender/session.h" +#include "blender/sync.h" +#include "blender/util.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/session.h index 9bc685ec306..fa24b5f7467 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/session.h @@ -17,6 +17,8 @@ #ifndef __BLENDER_SESSION_H__ #define __BLENDER_SESSION_H__ +#include "MEM_guardedalloc.h" + #include "RNA_blender_cpp.h" #include "device/device.h" @@ -25,7 +27,7 @@ #include "scene/scene.h" #include "session/session.h" -#include "util/util_vector.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/shader.cpp index 8d3bbb520c8..0cd9052b47a 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/shader.cpp @@ -14,26 +14,26 @@ * limitations under the License. */ +#include "scene/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" -#include "blender/blender_texture.h" -#include "blender/blender_util.h" +#include "blender/image.h" +#include "blender/sync.h" +#include "blender/texture.h" +#include "blender/util.h" -#include "util/util_debug.h" -#include "util/util_foreach.h" -#include "util/util_set.h" -#include "util/util_string.h" -#include "util/util_task.h" +#include "util/debug.h" +#include "util/foreach.h" +#include "util/set.h" +#include "util/string.h" +#include "util/task.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/sync.cpp index 1725ea5ec93..73d3a4436b5 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/sync.cpp @@ -30,17 +30,17 @@ #include "device/device.h" -#include "blender/blender_device.h" -#include "blender/blender_session.h" -#include "blender/blender_sync.h" -#include "blender/blender_util.h" - -#include "util/util_debug.h" -#include "util/util_foreach.h" -#include "util/util_hash.h" -#include "util/util_logging.h" -#include "util/util_opengl.h" -#include "util/util_openimagedenoise.h" +#include "blender/device.h" +#include "blender/session.h" +#include "blender/sync.h" +#include "blender/util.h" + +#include "util/debug.h" +#include "util/foreach.h" +#include "util/hash.h" +#include "util/log.h" +#include "util/opengl.h" +#include "util/openimagedenoise.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/sync.h index 99e3f0bf02b..c2377406876 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/sync.h @@ -22,17 +22,17 @@ #include "RNA_blender_cpp.h" #include "RNA_types.h" -#include "blender/blender_id_map.h" -#include "blender/blender_util.h" -#include "blender/blender_viewport.h" +#include "blender/id_map.h" +#include "blender/util.h" +#include "blender/viewport.h" #include "scene/scene.h" #include "session/session.h" -#include "util/util_map.h" -#include "util/util_set.h" -#include "util/util_transform.h" -#include "util/util_vector.h" +#include "util/map.h" +#include "util/set.h" +#include "util/transform.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_texture.cpp b/intern/cycles/blender/texture.cpp index 0d593f2b385..43745bb8376 100644 --- a/intern/cycles/blender/blender_texture.cpp +++ b/intern/cycles/blender/texture.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "blender/blender_texture.h" +#include "blender/texture.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_texture.h b/intern/cycles/blender/texture.h index 8ab061aaed9..ead0c4e631b 100644 --- a/intern/cycles/blender/blender_texture.h +++ b/intern/cycles/blender/texture.h @@ -17,7 +17,7 @@ #ifndef __BLENDER_TEXTURE_H__ #define __BLENDER_TEXTURE_H__ -#include "blender/blender_sync.h" +#include "blender/sync.h" #include <stdlib.h> CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/util.h index a3dd2349525..33fd2c416c8 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/util.h @@ -19,14 +19,14 @@ #include "scene/mesh.h" -#include "util/util_algorithm.h" -#include "util/util_array.h" -#include "util/util_map.h" -#include "util/util_path.h" -#include "util/util_set.h" -#include "util/util_transform.h" -#include "util/util_types.h" -#include "util/util_vector.h" +#include "util/algorithm.h" +#include "util/array.h" +#include "util/map.h" +#include "util/path.h" +#include "util/set.h" +#include "util/transform.h" +#include "util/types.h" +#include "util/vector.h" /* Hacks to hook into Blender API * todo: clean this up ... */ diff --git a/intern/cycles/blender/blender_viewport.cpp b/intern/cycles/blender/viewport.cpp index b8deb77b621..2a6f7e3ecee 100644 --- a/intern/cycles/blender/blender_viewport.cpp +++ b/intern/cycles/blender/viewport.cpp @@ -14,11 +14,12 @@ * limitations under the License. */ -#include "blender_viewport.h" +#include "blender/viewport.h" +#include "blender/util.h" -#include "blender_util.h" #include "scene/pass.h" -#include "util/util_logging.h" + +#include "util/log.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_viewport.h b/intern/cycles/blender/viewport.h index a445973f4d2..a445973f4d2 100644 --- a/intern/cycles/blender/blender_viewport.h +++ b/intern/cycles/blender/viewport.h diff --git a/intern/cycles/blender/blender_volume.cpp b/intern/cycles/blender/volume.cpp index 46083cb29dd..a41e15621a7 100644 --- a/intern/cycles/blender/blender_volume.cpp +++ b/intern/cycles/blender/volume.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ +#include "scene/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" +#include "blender/sync.h" +#include "blender/util.h" #ifdef WITH_OPENVDB # include <openvdb/openvdb.h> |