diff options
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/blender_device.h | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/blender/blender_object.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/blender/blender_python.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.h | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_texture.h | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_viewport.h | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/intern/cycles/blender/blender_device.h b/intern/cycles/blender/blender_device.h index fd6c045c966..8d2ecac7483 100644 --- a/intern/cycles/blender/blender_device.h +++ b/intern/cycles/blender/blender_device.h @@ -18,9 +18,9 @@ #define __BLENDER_DEVICE_H__ #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" #include "RNA_blender_cpp.h" +#include "RNA_types.h" #include "device/device.h" diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 075c9250e8c..a6f380a9ae7 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -14,25 +14,25 @@ * 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 "render/camera.h" -#include "blender/blender_sync.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 "util/util_algorithm.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/util_disjoint_set.h" #include "mikktspace.h" diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 4e488f12d0d..4b29c28913b 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -15,14 +15,14 @@ */ #include "render/camera.h" -#include "render/integrator.h" #include "render/graph.h" +#include "render/integrator.h" #include "render/light.h" #include "render/mesh.h" -#include "render/object.h" -#include "render/scene.h" #include "render/nodes.h" +#include "render/object.h" #include "render/particles.h" +#include "render/scene.h" #include "render/shader.h" #include "blender/blender_object_cull.h" diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index 816b4552fff..89bcebda193 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -19,8 +19,8 @@ #include "blender/CCL_api.h" #include "blender/blender_device.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" #include "render/denoising.h" @@ -38,8 +38,8 @@ #ifdef WITH_OSL # include "render/osl.h" -# include <OSL/oslquery.h> # include <OSL/oslconfig.h> +# include <OSL/oslquery.h> #endif #ifdef WITH_OPENCL diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 8e01ad9a96d..5ea96d6bdfd 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -41,8 +41,8 @@ #include "util/util_progress.h" #include "util/util_time.h" -#include "blender/blender_sync.h" #include "blender/blender_session.h" +#include "blender/blender_sync.h" #include "blender/blender_util.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 59c1539d207..edde1fd243e 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -24,14 +24,14 @@ #include "render/shader.h" #include "blender/blender_image.h" -#include "blender/blender_texture.h" #include "blender/blender_sync.h" +#include "blender/blender_texture.h" #include "blender/blender_util.h" #include "util/util_debug.h" #include "util/util_foreach.h" -#include "util/util_string.h" #include "util/util_set.h" +#include "util/util_string.h" #include "util/util_task.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 9f7797efb97..91d715af7e2 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -16,6 +16,7 @@ #include "render/background.h" #include "render/camera.h" +#include "render/curves.h" #include "render/film.h" #include "render/graph.h" #include "render/integrator.h" @@ -25,19 +26,18 @@ #include "render/object.h" #include "render/scene.h" #include "render/shader.h" -#include "render/curves.h" #include "device/device.h" #include "blender/blender_device.h" -#include "blender/blender_sync.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_opengl.h" #include "util/util_hash.h" +#include "util/util_opengl.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 25e933dc599..650b4f5bb4e 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -18,9 +18,9 @@ #define __BLENDER_SYNC_H__ #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" #include "RNA_blender_cpp.h" +#include "RNA_types.h" #include "blender/blender_id_map.h" #include "blender/blender_viewport.h" diff --git a/intern/cycles/blender/blender_texture.h b/intern/cycles/blender/blender_texture.h index 896bf62da70..8ab061aaed9 100644 --- a/intern/cycles/blender/blender_texture.h +++ b/intern/cycles/blender/blender_texture.h @@ -17,8 +17,8 @@ #ifndef __BLENDER_TEXTURE_H__ #define __BLENDER_TEXTURE_H__ -#include <stdlib.h> #include "blender/blender_sync.h" +#include <stdlib.h> CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/blender/blender_viewport.h b/intern/cycles/blender/blender_viewport.h index d2b55358c27..3e44e552f1d 100644 --- a/intern/cycles/blender/blender_viewport.h +++ b/intern/cycles/blender/blender_viewport.h @@ -18,9 +18,9 @@ #define __BLENDER_VIEWPORT_H__ #include "MEM_guardedalloc.h" -#include "RNA_types.h" #include "RNA_access.h" #include "RNA_blender_cpp.h" +#include "RNA_types.h" #include "render/film.h" #include "util/util_param.h" |