Revision: 42645
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42645
Author: jbakker
Date: 2011-12-15 13:38:45 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Tile branch:
removed a warning (missing return)
removed a debug statement
Modified Paths:
--------------
branches/tile/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/tile/source/blender/compositor/intern/COM_WorkScheduler.cpp
Modified: branches/tile/source/blender/compositor/intern/COM_ExecutionGroup.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_ExecutionGroup.cpp
2011-12-15 13:01:01 UTC (rev 42644)
+++ branches/tile/source/blender/compositor/intern/COM_ExecutionGroup.cpp
2011-12-15 13:38:45 UTC (rev 42645)
@@ -95,7 +95,6 @@
this->openCL = operation->isOpenCL();
this->initialized = true;
}
- printf("Adding operation to group %d, %d\n", this, operation);
this->operations.push_back(operation);
if (operation->isReadBufferOperation()) {
ReadBufferOperation* readOperation =
(ReadBufferOperation*)operation;
Modified: branches/tile/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_WorkScheduler.cpp
2011-12-15 13:01:01 UTC (rev 42644)
+++ branches/tile/source/blender/compositor/intern/COM_WorkScheduler.cpp
2011-12-15 13:38:45 UTC (rev 42645)
@@ -75,6 +75,7 @@
WorkPackage * package = (WorkPackage*)data;
device.execute(package);
delete package;
+ return NULL;
}
#endif
#if COM_CURRENT_THREADING_MODEL == COM_TM_PTHREAD
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
