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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-07-23 13:08:19 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-07-23 13:10:38 +0300
commit1788293a0125e178cf7cbea60113ae7d81749cbe (patch)
tree67ad443a304257fa8959b61eaa9efb6811925e6f /intern/cycles/blender/addon/engine.py
parentcc5d48e8dd9b96c151e0f1dd1e71e6de7231a95f (diff)
Fix T45381: Crash Blender 2.75 in Win7 x64 AMD card
Previous fix didn't work well enough because on Windows Python has different environment than Blender ans setting variables in there made no effect from Blender point of view.
Diffstat (limited to 'intern/cycles/blender/addon/engine.py')
-rw-r--r--intern/cycles/blender/addon/engine.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index db81cbbcd9b..c936b900d75 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -44,9 +44,10 @@ def _is_using_buggy_driver():
def _workaround_buggy_drivers():
if _is_using_buggy_driver():
- import os
- print("Cycles: OpenGL driver known to be buggy, disabling OpenCL platform.")
- os.environ["CYCLES_OPENCL_TEST"] = "NONE"
+ import _cycles
+ if hasattr(_cycles, "opencl_disable"):
+ print("Cycles: OpenGL driver known to be buggy, disabling OpenCL platform.")
+ _cycles.opencl_disable()
def init():
import bpy