[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43089] branches/tile/source/blender/ compositor/intern: Tile Branch

Thomas Dinges blender at dingto.org
Tue Jan 3 03:38:49 CET 2012


Revision: 43089
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43089
Author:   dingto
Date:     2012-01-03 02:38:48 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Tile Branch
* Fix some wrong #if's to #ifdef's

Modified Paths:
--------------
    branches/tile/source/blender/compositor/intern/COM_Node.cpp
    branches/tile/source/blender/compositor/intern/COM_WorkScheduler.cpp

Modified: branches/tile/source/blender/compositor/intern/COM_Node.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_Node.cpp	2012-01-03 02:26:32 UTC (rev 43088)
+++ branches/tile/source/blender/compositor/intern/COM_Node.cpp	2012-01-03 02:38:48 UTC (rev 43089)
@@ -78,7 +78,7 @@
 }
 
 void Node::addPreviewOperation(ExecutionSystem *system, OutputSocket *outputSocket, int priority) {
-#if COM_PREVIEW_ENABLED
+#ifdef COM_PREVIEW_ENABLED
 	PreviewOperation *operation = new PreviewOperation();
 	system->addOperation(operation);
 	operation->setbNode(this->getbNode());

Modified: branches/tile/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_WorkScheduler.cpp	2012-01-03 02:26:32 UTC (rev 43088)
+++ branches/tile/source/blender/compositor/intern/COM_WorkScheduler.cpp	2012-01-03 02:38:48 UTC (rev 43089)
@@ -71,7 +71,7 @@
 static ThreadQueue * cpuqueue;
 #endif
 
-#if COM_OPENCL_ENABLED
+#ifdef COM_OPENCL_ENABLED
 static cl_context context;
 static cl_program program;
 #endif
@@ -317,7 +317,7 @@
 		cpudevices.push_back(device);
 	}
 #endif
-#if COM_OPENCL_ENABLED
+#ifdef COM_OPENCL_ENABLED
 	context = NULL;
 	program = NULL;
 	if (clCreateContextFromType) {
@@ -396,7 +396,7 @@
 		device->deinitialize();
 		delete device;
 	}
-#if COM_OPENCL_ENABLED
+#ifdef COM_OPENCL_ENABLED
 	if (program) {
 		clReleaseProgram(program);
 		program = NULL;



More information about the Bf-blender-cvs mailing list