Manual merge of r53005 by Brecht to the "a" tag:

* Cycles: make "Open Shading Language" a boolean toggle, the other option "GPU Compatible" was confusing.

3 files changed, 5 insertions, 12 deletions

diff --git a/intern/cycles/blender/addon/enums.py b/intern/cycles/blender/addon/enums.py
index 82b48973ca1..fa9801e15d4 100644
--- a/intern/cycles/blender/addon/enums.py
+++ b/intern/cycles/blender/addon/enums.py
@@ -29,11 +29,6 @@ feature_set = (
     ('EXPERIMENTAL', "Experimental", "Use experimental and incomplete features that might be broken or change in the future"),
     )
 
-shading_systems = (
-    ('GPU_COMPATIBLE', "GPU Compatible", "Restricted shading system compatible with GPU rendering"),
-    ('OSL', "Open Shading Language", "Open Shading Language shading system that only runs on the CPU"),
-    )
-
 displacement_methods = (
     ('BUMP', "Bump", "Bump mapping to simulate the appearance of displacement"),
     ('TRUE', "True", "Use true displacement only, requires fine subdivision"),
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 0b8ca6e0fbe..f6dbf6b6e02 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -50,11 +50,9 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
                 items=enums.feature_set,
                 default='SUPPORTED',
                 )
-        cls.shading_system = EnumProperty(
-                name="Shading System",
-                description="Shading system to use for rendering",
-                items=enums.shading_systems,
-                default='GPU_COMPATIBLE',
+        cls.shading_system = BoolProperty(
+                name="Open Shading Language",
+                description="Use Open Shading Language (CPU rendering only)",
                 )
 
         cls.progressive = BoolProperty(
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index d0e8b508df6..e78026e7ae1 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -289,7 +289,7 @@ SceneParams BlenderSync::get_scene_params(BL::Scene b_scene, bool background)
 	BL::RenderSettings r = b_scene.render();
 	SceneParams params;
 	PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
-	int shadingsystem = RNA_enum_get(&cscene, "shading_system");
+	int shadingsystem = RNA_boolean_get(&cscene, "shading_system");
 
 	if(shadingsystem == 0)
 		params.shadingsystem = SceneParams::SVM;
@@ -414,7 +414,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
 		params.progressive = true;
 
 	/* shading system - scene level needs full refresh */
-	int shadingsystem = RNA_enum_get(&cscene, "shading_system");
+	int shadingsystem = RNA_boolean_get(&cscene, "shading_system");
 
 	if(shadingsystem == 0)
 		params.shadingsystem = SessionParams::SVM;