[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50420] trunk/blender/source/blender/ compositor/intern/COM_WorkScheduler.cpp: Fix compositor crash.

Antony Riakiotakis kalast at gmail.com
Wed Sep 5 15:50:24 CEST 2012


Revision: 50420
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50420
Author:   psy-fi
Date:     2012-09-05 13:50:24 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
Fix compositor crash. g_highlightedNodes can be NULL.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp

Modified: trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp	2012-09-05 12:14:09 UTC (rev 50419)
+++ trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp	2012-09-05 13:50:24 UTC (rev 50420)
@@ -93,8 +93,10 @@
 				if (node->original) { \
 					node = node->original; \
 				} \
-				if (g_highlightIndex < MAX_HIGHLIGHT) { \
-					g_highlightedNodes[g_highlightIndex++] = node; \
+				if (g_highlightInitialized && g_highlightedNodes) { \
+					if (g_highlightIndex < MAX_HIGHLIGHT) { \
+						g_highlightedNodes[g_highlightIndex++] = node; \
+					} \
 				} \
 			} \
 		} \




More information about the Bf-blender-cvs mailing list