[Bf-blender-cvs] [4735fdc] master: Cycles: Better feedback about experimental features being used

Sergey Sharybin noreply at git.blender.org
Thu Sep 25 21:04:37 CEST 2014


Commit: 4735fdc28082f41311a25524a01a7d7297f36db0
Author: Sergey Sharybin
Date:   Fri Sep 26 01:02:28 2014 +0600
Branches: master
https://developer.blender.org/rB4735fdc28082f41311a25524a01a7d7297f36db0

Cycles: Better feedback about experimental features being used

Instead of having a label which basically duplicated the information
about experimental feature set being used (which had a bug because
it claimed experimental GPU kernel is used even if compute device is
CPU btw) now we've got an enum item icon.

So once you switched to experimental feature set you'll see an
exclamation mark icon in the enum, so you know something might be
unstable or slow.

===================================================================

M	intern/cycles/blender/addon/properties.py
M	intern/cycles/blender/addon/ui.py

===================================================================

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 0ac0e0f..597ac1a 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -37,7 +37,7 @@ if _cycles.with_network:
 
 enum_feature_set = (
     ('SUPPORTED', "Supported", "Only use finished and supported features"),
-    ('EXPERIMENTAL', "Experimental", "Use experimental and incomplete features that might be broken or change in the future"),
+    ('EXPERIMENTAL', "Experimental", "Use experimental and incomplete features that might be broken or change in the future", 'ERROR', 1),
     )
 
 enum_displacement_methods = (
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index d81343c..9632b12 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1357,9 +1357,6 @@ def draw_device(self, context):
 
         if engine.with_osl() and use_cpu(context):
             layout.prop(cscene, "shading_system")
-            
-        if device_type == 'CUDA' and cscene.feature_set == 'EXPERIMENTAL':
-            layout.label(text="Using experimental GPU kernel", icon='ERROR')
 
 
 def draw_pause(self, context):




More information about the Bf-blender-cvs mailing list