archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source
This commit is contained in:
Brecht Van Lommel
2012-12-14 15:26:49 +00:00
parent 16003d2738
commit 0f5b5bb5f1
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_sync.cpp
View File

@@ -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;