[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53083] tags/blender-2.65a-release/blender /intern/cycles/blender: Manual merge of r53005 by Brecht to the "a" tag:

[Thomas Dinges]

Revision: 53083
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53083
Author:   dingto
Date:     2012-12-17 12:33:12 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
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.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53005

Modified Paths:
--------------
    tags/blender-2.65a-release/blender/intern/cycles/blender/addon/enums.py
    tags/blender-2.65a-release/blender/intern/cycles/blender/addon/properties.py
    tags/blender-2.65a-release/blender/intern/cycles/blender/blender_sync.cpp

Modified: tags/blender-2.65a-release/blender/intern/cycles/blender/addon/enums.py
===================================================================
--- tags/blender-2.65a-release/blender/intern/cycles/blender/addon/enums.py	2012-12-17 12:03:31 UTC (rev 53082)
+++ tags/blender-2.65a-release/blender/intern/cycles/blender/addon/enums.py	2012-12-17 12:33:12 UTC (rev 53083)
@@ -29,11 +29,6 @@
     ('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"),

Modified: tags/blender-2.65a-release/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- tags/blender-2.65a-release/blender/intern/cycles/blender/addon/properties.py	2012-12-17 12:03:31 UTC (rev 53082)
+++ tags/blender-2.65a-release/blender/intern/cycles/blender/addon/properties.py	2012-12-17 12:33:12 UTC (rev 53083)
@@ -50,11 +50,9 @@
                 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(

Modified: tags/blender-2.65a-release/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- tags/blender-2.65a-release/blender/intern/cycles/blender/blender_sync.cpp	2012-12-17 12:03:31 UTC (rev 53082)
+++ tags/blender-2.65a-release/blender/intern/cycles/blender/blender_sync.cpp	2012-12-17 12:33:12 UTC (rev 53083)
@@ -289,7 +289,7 @@
 	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 @@
 		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;