From 4735fdc28082f41311a25524a01a7d7297f36db0 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 26 Sep 2014 01:02:28 +0600 Subject: [PATCH] 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. --- intern/cycles/blender/addon/properties.py | 2 +- intern/cycles/blender/addon/ui.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 0ac0e0f091e..597ac1a9ce0 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 d81343cb4c9..9632b12c414 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):