diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-07-17 16:57:03 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-07-17 16:57:03 +0400 |
| commit | c7e2c3f5e1e2c6e94511f89369af2fcd7e7fd8e9 (patch) | |
| tree | a6e02dd917c50a950535c8960fe4e192515fcdb3 /source/blender/compositor/intern/COM_WorkScheduler.cpp | |
| parent | a9eccaf85eb590d6ec8a44f687898045b3b49404 (diff) | |
Possible fix for [#36086] Activating the opencl option in the compositor causes blender crash
* Now OCL_init() returns error messages if the OpenCL library cannot be loaded.
Diffstat (limited to 'source/blender/compositor/intern/COM_WorkScheduler.cpp')
| -rw-r--r-- | source/blender/compositor/intern/COM_WorkScheduler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 402fa28e210..be9a3612a0b 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -304,7 +304,8 @@ void WorkScheduler::initialize(bool use_opencl) g_context = NULL; g_program = NULL; - OCL_init(); /* this will check and skip if already initialized */ + if(!OCL_init()) /* this will check for errors and skip if already initialized */ + return; if (clCreateContextFromType) { cl_uint numberOfPlatforms = 0; |