diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-04 22:47:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-04 22:47:08 +0400 |
commit | 306e2b48786bc27d818c1ee04382cf654310c3a0 (patch) | |
tree | 8d719a1b77390a1ddf77ade3378292297829ddb9 /source/blender/compositor | |
parent | 068cceab6c491ddbe3a3baec560900a57db279b2 (diff) |
stule cleanup
Diffstat (limited to 'source/blender/compositor')
-rw-r--r-- | source/blender/compositor/intern/COM_WorkScheduler.cpp | 11 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_compositor.cpp | 5 |
2 files changed, 6 insertions, 10 deletions
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index f7ae2945471..78e198ac9c2 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -120,8 +120,7 @@ void COM_startReadHighlights() int COM_isHighlightedbNode(bNode *bnode) { - if (!g_highlightInitialized) - { + if (!g_highlightInitialized) { return false; } @@ -129,7 +128,7 @@ int COM_isHighlightedbNode(bNode *bnode) return false; } - for (int i = 0 ; i < MAX_HIGHLIGHT; i++) { + for (int i = 0; i < MAX_HIGHLIGHT; i++) { void *p = g_highlightedNodesRead[i]; if (!p) return false; if (p == bnode) return true; @@ -409,14 +408,12 @@ void WorkScheduler::deinitialize() /* deinitialize highlighting */ if (g_highlightInitialized) { g_highlightInitialized = false; - if (g_highlightedNodes) - { + if (g_highlightedNodes) { MEM_freeN(g_highlightedNodes); g_highlightedNodes = NULL; } - if (g_highlightedNodesRead) - { + if (g_highlightedNodesRead) { MEM_freeN(g_highlightedNodesRead); g_highlightedNodesRead = NULL; } diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 6369eff3048..cb9166c929d 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -68,7 +68,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering) /* set progress bar to 0% and status to init compositing */ editingtree->progress(editingtree->prh, 0.0); - bool twopass = (editingtree->flag&NTREE_TWO_PASS) > 0 && !rendering; + bool twopass = (editingtree->flag & NTREE_TWO_PASS) > 0 && !rendering; /* initialize execution system */ if (twopass) { ExecutionSystem *system = new ExecutionSystem(rd, editingtree, rendering, twopass); @@ -93,8 +93,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering) void COM_freeCaches() { - if (is_compositorMutex_init) - { + if (is_compositorMutex_init) { BLI_mutex_lock(&s_compositorMutex); intern_freeCompositorCaches(); BLI_mutex_unlock(&s_compositorMutex); |