Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2012-09-05 17:50:24 +0400
committerAntony Riakiotakis <kalast@gmail.com>2012-09-05 17:50:24 +0400
commit9ca25136a1b0a3dba359f9d96e6335b207872b78 (patch)
tree87dc1509c4e8b4c6187a0ab89378054bf5f16181 /source/blender/compositor
parenta823207d81269f5e371684a3d6d2c910b76a74cc (diff)
Fix compositor crash. g_highlightedNodes can be NULL.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/intern/COM_WorkScheduler.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index 78e198ac9c2..f732a40e768 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -93,8 +93,10 @@ void **g_highlightedNodesRead;
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; \
+ } \
} \
} \
} \