Revision: 50083
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50083
Author: campbellbarton
Date: 2012-08-21 11:53:09 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
code cleanup: more legacy compo functions ifdef'd
Modified Paths:
--------------
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/composite/node_composite_util.h
trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
Modified: trunk/blender/source/blender/nodes/composite/node_composite_tree.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_tree.c
2012-08-21 11:35:40 UTC (rev 50082)
+++ trunk/blender/source/blender/nodes/composite/node_composite_tree.c
2012-08-21 11:53:09 UTC (rev 50083)
@@ -95,7 +95,9 @@
for (sock= node->outputs.first; sock; sock= sock->next) {
if (sock->cache) {
+#ifdef WITH_COMPOSITOR_LEGACY
free_compbuf(sock->cache);
+#endif
sock->cache= NULL;
}
}
@@ -159,8 +161,9 @@
for (sock= node->outputs.first; sock; sock= sock->next) {
sock->new_sock->cache= sock->cache;
+#ifdef WITH_COMPOSITOR_LEGACY
compbuf_set_node(sock->new_sock->cache, node->new_node);
-
+#endif
sock->cache= NULL;
sock->new_sock->new_sock= sock;
}
@@ -236,7 +239,9 @@
for (lsock= lnode->outputs.first; lsock; lsock=
lsock->next) {
if (ntreeOutputExists(lnode->new_node,
lsock->new_sock)) {
lsock->new_sock->cache= lsock->cache;
+#ifdef WITH_COMPOSITOR_LEGACY
compbuf_set_node(lsock->new_sock->cache, lnode->new_node);
+#endif
lsock->cache= NULL;
lsock->new_sock= NULL;
}
Modified: trunk/blender/source/blender/nodes/composite/node_composite_util.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_util.c
2012-08-21 11:35:40 UTC (rev 50082)
+++ trunk/blender/source/blender/nodes/composite/node_composite_util.c
2012-08-21 11:53:09 UTC (rev 50083)
@@ -29,9 +29,10 @@
* \ingroup nodes
*/
-
#include "node_composite_util.h"
+#ifdef WITH_COMPOSITOR_LEGACY
+
#include <limits.h>
CompBuf *alloc_compbuf(int sizex, int sizey, int type, int alloc)
@@ -1405,3 +1406,4 @@
#undef YVV
}
+#endif /* WITH_COMPOSITOR_LEGACY */
Modified: trunk/blender/source/blender/nodes/composite/node_composite_util.h
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_util.h
2012-08-21 11:35:40 UTC (rev 50082)
+++ trunk/blender/source/blender/nodes/composite/node_composite_util.h
2012-08-21 11:53:09 UTC (rev 50083)
@@ -86,7 +86,10 @@
/* only for forward declarations */
#include "NOD_composite.h"
+#define CMP_SCALE_MAX 12000
+#ifdef WITH_COMPOSITOR_LEGACY
+
/* *************************** operations support ***************************
*/
/* general signal that's in output sockets, and goes over the wires */
@@ -198,9 +201,9 @@
/* transformations */
-#define CMP_SCALE_MAX 12000
-
CompBuf* node_composit_transform(CompBuf *cbuf, float x, float y, float angle,
float scale, int filter_type);
float *node_composit_get_float_buffer(RenderData *rd, ImBuf *ibuf, int *alloc);
#endif
+
+#endif /* WITH_COMPOSITOR_LEGACY */
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
2012-08-21 11:35:40 UTC (rev 50082)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_common.c
2012-08-21 11:53:09 UTC (rev 50083)
@@ -30,7 +30,6 @@
* \ingroup cmpnodes
*/
-
#include "DNA_node_types.h"
#include "BKE_node.h"
@@ -184,7 +183,9 @@
for (i=0, ns=gexec->stack; i < gexec->stacksize; ++i, ++ns) {
if (!ns->external && !ns->is_copy) {
if (ns->data) {
+#ifdef WITH_COMPOSITOR_LEGACY
free_compbuf(ns->data);
+#endif
ns->data = NULL;
}
}
@@ -231,6 +232,7 @@
nodeRegisterType(ttype, &ntype);
}
+#ifdef WITH_COMPOSITOR_LEGACY
/**** FOR LOOP ****/
@@ -377,3 +379,5 @@
nodeRegisterType(ttype, &ntype);
}
#endif
+
+#endif /* WITH_COMPOSITOR_LEGACY */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
