diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-31 20:28:39 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-31 20:51:49 +0300 |
commit | 95687f9751cae08b14d815656261c069aec41238 (patch) | |
tree | 85e444b843f8d0e386c8a15f9b44e31345e040f4 /intern/cycles/blender/blender_sync.cpp | |
parent | 778afc8082680041ae52b4500eeb77113eebac39 (diff) |
Fix T42349: Windows Render command line Cycles Crash
The issue was caused by GLEW MX enabled in SCons by default so
basically previous commit already fixed the crash. But we need
to be safe here.
For now the fix is simple and not that clean, just check if
there's an OpenGL context available and if not we don't do any
GLSL magic.
This is to be cleaned up after some discussion with the viewport
project guys.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 2ac90b34fd7..bd3dc816657 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -515,7 +515,17 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use params.shadingsystem = SHADINGSYSTEM_OSL; /* color managagement */ - params.display_buffer_linear = GLEW_ARB_half_float_pixel && b_engine.support_display_space_shader(b_scene); +#ifdef GLEW_MX + /* When using GLEW MX we need to check whether we've got an OpenGL + * context for crrent window. This is because command line rendering + * doesn't have OpenGL context actually. + */ + if(glewGetContext() != NULL) +#endif + { + params.display_buffer_linear = GLEW_ARB_half_float_pixel && + b_engine.support_display_space_shader(b_scene); + } return params; } |