diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-06 13:17:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-06 13:17:07 +0300 |
| commit | 47fd882e79f337a90a66f8b9a21bfe92c7e5f25e (patch) | |
| tree | 0b4e369327f9f24337acf857eb014abd304d3c1d /source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc | |
| parent | a418e269c8c5660190da9423aaf3d5e792442750 (diff) | |
| parent | 58a434b37256766a73ecda79f7620632f2183fb8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc index aa04e0e888c..08a897df2aa 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc @@ -38,10 +38,10 @@ #include "MEM_guardedalloc.h" -extern "C" { -#include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BLI_blenlib.h" +extern "C" { #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -49,10 +49,10 @@ extern "C" { #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_node.h" +} /* extern "C" */ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -} /* extern "C" */ #include "intern/builder/deg_builder.h" #include "intern/builder/deg_builder_pchanmap.h" |