[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53002] trunk/blender/intern/cycles/ blender/addon/properties.py: Revert a part of my last commit, accidentally committed some unfinished UI changes.

[Thomas Dinges]

Revision: 53002
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53002
Author:   dingto
Date:     2012-12-14 15:05:05 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Revert a part of my last commit, accidentally committed some unfinished UI changes. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/properties.py

Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py	2012-12-14 14:59:16 UTC (rev 53001)
+++ trunk/blender/intern/cycles/blender/addon/properties.py	2012-12-14 15:05:05 UTC (rev 53002)
@@ -37,8 +37,8 @@
     )
 
 enum_shading_systems = (
-    ('SVM', "SVM", "Restricted shading system compatible with GPU rendering"),
-    ('OSL', "OSL", "Open Shading Language shading system that only runs on the CPU"),
+    ('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"),
     )
 
 enum_displacement_methods = (
@@ -93,7 +93,7 @@
                 name="Shading System",
                 description="Shading system to use for rendering",
                 items=enum_shading_systems,
-                default='SVM',
+                default='GPU_COMPATIBLE',
                 )
 
         cls.progressive = BoolProperty(