diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
| commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
| tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc index d5e9c024812..1aa3c5bf613 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc @@ -30,9 +30,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_string.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_freestyle_types.h" @@ -52,10 +52,10 @@ extern "C" { #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" +#include "intern/depsgraph_type.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_type.h" namespace DEG { |