diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-30 18:14:22 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-30 18:14:22 +0400 |
commit | 90dc1d1353ec85b67e76a3c93eacf7f7216deaae (patch) | |
tree | c2836de60cbf5beef1dd7002f105189d6b4f2fa1 /source/blender/nodes/composite/node_composite_tree.c | |
parent | e6d55c97ddea01ba08c9f01888adf715ab2c6ef0 (diff) |
the compositor optional for cmake: WITH_COMPOSITOR
Diffstat (limited to 'source/blender/nodes/composite/node_composite_tree.c')
-rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index b716f19a697..b886ee80d55 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -59,7 +59,10 @@ #include "NOD_composite.h" #include "node_composite_util.h" -#include "COM_compositor.h" + +#ifdef WITH_COMPOSITOR +# include "COM_compositor.h" +#endif static void foreach_nodetree(Main *main, void *calldata, bNodeTreeCallback func) { @@ -351,6 +354,8 @@ void ntreeCompositEndExecTree(bNodeTreeExec *exec, int use_tree_data) } } +#ifdef WITH_COMPOSITOR + /* ***************************** threaded version for execute composite nodes ************* */ /* these are nodes without input, only giving values */ /* or nodes with only value inputs */ @@ -586,7 +591,6 @@ static void ntree_composite_texnode(bNodeTree *ntree, int init) } /* optimized tree execute test for compositing */ -/* optimized tree execute test for compositing */ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_preview) { bNodeExec *nodeexec; @@ -677,13 +681,18 @@ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_pr /* XXX top-level tree uses the ntree->execdata pointer */ ntreeCompositEndExecTree(exec, 1); } +#endif void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int rendering, int do_preview) { +#ifdef WITH_COMPOSITOR if (G.rt == 200) ntreeCompositExecTreeOld(ntree, rd, do_preview); else COM_execute(rd, ntree, rendering); +#else + (void)ntree, (void)rd, (void)rendering, (void)do_preview; +#endif } /* *********************************************** */ |