diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 15:19:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 15:19:38 +0400 |
| commit | 158a70c8a387c1e3fa414ecfbb063091421992d8 (patch) | |
| tree | 07212c8732c5987dc838266714d2038296b9a6c4 /source/blender/compositor/intern/COM_compositor.cpp | |
| parent | 23f632a49c2b00aece9286c125b98fdc10e93532 (diff) | |
the mutex struct seems to be different across systems, use memset rather then an initializer value.
also quiet warning in cycles.
Diffstat (limited to 'source/blender/compositor/intern/COM_compositor.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_compositor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 89537a51cda..7282cf65bc3 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -33,11 +33,12 @@ extern "C" { #include "COM_WorkScheduler.h" #include "OCL_opencl.h" -static ThreadMutex compositorMutex = {(0)}; +static ThreadMutex compositorMutex; static char is_compositorMutex_init = FALSE; void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering) { if (is_compositorMutex_init == FALSE) { /// TODO: move to blender startup phase + memset(&compositorMutex, 0, sizeof(compositorMutex)); BLI_mutex_init(&compositorMutex); OCL_init(); WorkScheduler::initialize(); ///TODO: call workscheduler.deinitialize somewhere |