diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
| commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
| tree | 0cbb1b91fe26c750197126085b74224a795a103c /source/blender/nodes/composite/node_composite_tree.cc | |
| parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
| parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) | |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'source/blender/nodes/composite/node_composite_tree.cc')
| -rw-r--r-- | source/blender/nodes/composite/node_composite_tree.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.cc b/source/blender/nodes/composite/node_composite_tree.cc index 0b75dd9cef3..9792c55b590 100644 --- a/source/blender/nodes/composite/node_composite_tree.cc +++ b/source/blender/nodes/composite/node_composite_tree.cc @@ -15,6 +15,7 @@ #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_image.h" #include "BKE_main.h" #include "BKE_node.h" #include "BKE_node_tree_update.h" @@ -31,7 +32,7 @@ #include "NOD_composite.h" #include "node_composite_util.hh" -#ifdef WITH_COMPOSITOR +#ifdef WITH_COMPOSITOR_CPU # include "COM_compositor.h" #endif @@ -182,6 +183,7 @@ void register_node_tree_type_cmp() tt->type = NTREE_COMPOSIT; strcpy(tt->idname, "CompositorNodeTree"); + strcpy(tt->group_idname, "CompositorNodeGroup"); strcpy(tt->ui_name, N_("Compositor")); tt->ui_icon = ICON_NODE_COMPOSITING; strcpy(tt->ui_description, N_("Compositing nodes")); @@ -208,7 +210,7 @@ void ntreeCompositExecTree(Scene *scene, int do_preview, const char *view_name) { -#ifdef WITH_COMPOSITOR +#ifdef WITH_COMPOSITOR_CPU COM_execute(rd, scene, ntree, rendering, view_name); #else UNUSED_VARS(scene, ntree, rd, rendering, view_name); |