[Bf-blender-cvs] [7f3488f] master: Freestyle: show "use_nodes" option in the UI when Cycles is enabled.

Tamito Kajiyama noreply at git.blender.org
Tue Aug 12 03:17:39 CEST 2014


Commit: 7f3488f9925d974ac5e95385fccd61ede1531d1f
Author: Tamito Kajiyama
Date:   Fri Jul 18 11:45:00 2014 +0900
Branches: master
https://developer.blender.org/rB7f3488f9925d974ac5e95385fccd61ede1531d1f

Freestyle: show "use_nodes" option in the UI when Cycles is enabled.

The "use_textures" option is intended for the BI and does not make sense in Cycles.

===================================================================

M	release/scripts/startup/bl_ui/properties_freestyle.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py
index 03eb3f0..58818e9 100644
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@ -674,7 +674,10 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel,
             layout.separator()
 
             row = layout.row()
-            row.prop(linestyle, "use_texture")
+            if rd.use_shading_nodes:
+                row.prop(linestyle, "use_nodes")
+            else:
+                row.prop(linestyle, "use_texture")
             row.prop(linestyle, "texture_spacing", text="Spacing Along Stroke")
 
             row = layout.row()




More information about the Bf-blender-cvs mailing list