Revision: 43833
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43833
Author: dfelinto
Date: 2012-02-02 00:14:35 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
adding double edge mask to the list of to be converted nodes + blenderplayer
stubs update
Modified Paths:
--------------
branches/tile/source/blender/compositor/intern/COM_Converter.cpp
branches/tile/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: branches/tile/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_Converter.cpp
2012-02-02 00:04:47 UTC (rev 43832)
+++ branches/tile/source/blender/compositor/intern/COM_Converter.cpp
2012-02-02 00:14:35 UTC (rev 43833)
@@ -306,7 +306,7 @@
case CMP_NODE_OUTPUT_FILE:
case CMP_NODE_COLOR_SPILL:
case CMP_NODE_CHANNEL_MATTE:
-// case CMP_NODE_DOUBLEEDGEMASK: // to be re-enabled with next merge from
trunk
+ case CMP_NODE_DOUBLEEDGEMASK:
case CMP_NODE_DEFOCUS:
case CMP_NODE_CROP:
case CMP_NODE_BILATERALBLUR:
Modified: branches/tile/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- branches/tile/source/blenderplayer/bad_level_call_stubs/stubs.c
2012-02-02 00:04:47 UTC (rev 43832)
+++ branches/tile/source/blenderplayer/bad_level_call_stubs/stubs.c
2012-02-02 00:14:35 UTC (rev 43833)
@@ -484,6 +484,9 @@
struct CCLDeviceInfo;
struct CCLDeviceInfo *CCL_compute_device_list(int opencl) { return NULL; }
+/* composite */
+void COM_execute(struct bNodeTree *editingtree, int rendering){}
+
char blender_path[] = "";
#endif // WITH_GAMEENGINE
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
