diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-14 19:26:49 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-14 19:26:49 +0400 |
commit | 0f5b5bb5f1ceed1cd5ba1491c8c2f7fa8e21ec2a (patch) | |
tree | d10fd20ab09fd7ab44b5e2a850bd4bd7e924ca55 /intern | |
parent | 16003d27385f2a4ce3c5b34681ceda8c0cc33553 (diff) |
Cycles: make "Open Shading Language" a boolean toggle, the other option "GPU Compatible" was confusing.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 13 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 4 |
2 files changed, 5 insertions, 12 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index ae4b7e3cc92..26fc7a81936 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -36,11 +36,6 @@ enum_feature_set = ( ('EXPERIMENTAL', "Experimental", "Use experimental and incomplete features that might be broken or change in the future"), ) -enum_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"), - ) - enum_displacement_methods = ( ('BUMP', "Bump", "Bump mapping to simulate the appearance of displacement"), ('TRUE', "True", "Use true displacement only, requires fine subdivision"), @@ -89,11 +84,9 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): items=enum_feature_set, default='SUPPORTED', ) - cls.shading_system = EnumProperty( - name="Shading System", - description="Shading system to use for rendering", - items=enum_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; |