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/editors/space_node/node_group.c | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'source/blender/editors/space_node/node_group.c')
| -rw-r--r-- | source/blender/editors/space_node/node_group.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c index 5d020ff5ab4..2a4c6147d5d 100644 --- a/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@ -25,11 +25,11 @@ #include "MEM_guardedalloc.h" -#include "DNA_node_types.h" #include "DNA_anim_types.h" +#include "DNA_node_types.h" -#include "BLI_listbase.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLT_translation.h" @@ -37,15 +37,15 @@ #include "BKE_action.h" #include "BKE_animsys.h" #include "BKE_context.h" -#include "BKE_library.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_report.h" #include "DEG_depsgraph_build.h" #include "ED_node.h" /* own include */ -#include "ED_screen.h" #include "ED_render.h" +#include "ED_screen.h" #include "RNA_access.h" #include "RNA_define.h" @@ -55,8 +55,8 @@ #include "UI_resources.h" -#include "node_intern.h" /* own include */ #include "NOD_common.h" +#include "node_intern.h" /* own include */ static bool node_group_operator_active(bContext *C) { |