[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57560] trunk/blender/intern/cycles/ blender/addon: Cycles / UI:
Thomas Dinges
blender at dingto.org
Wed Jun 19 00:34:37 CEST 2013
Revision: 57560
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57560
Author: dingto
Date: 2013-06-18 22:34:37 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Cycles / UI:
* Some tweaks to the material "Settings" panel.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/__init__.py
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
Modified: trunk/blender/intern/cycles/blender/addon/__init__.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/__init__.py 2013-06-18 22:33:54 UTC (rev 57559)
+++ trunk/blender/intern/cycles/blender/addon/__init__.py 2013-06-18 22:34:37 UTC (rev 57560)
@@ -21,7 +21,7 @@
bl_info = {
"name": "Cycles Render Engine",
"author": "",
- "blender": (2, 66, 0),
+ "blender": (2, 67, 0),
"location": "Info header, render engine menu",
"description": "Cycles Render Engine integration",
"warning": "",
Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py 2013-06-18 22:33:54 UTC (rev 57559)
+++ trunk/blender/intern/cycles/blender/addon/properties.py 2013-06-18 22:34:37 UTC (rev 57560)
@@ -506,7 +506,7 @@
)
cls.use_transparent_shadow = BoolProperty(
name="Transparent Shadows",
- description="Use transparent shadows for this material if it contains a Transparent BSDF"
+ description="Use transparent shadows for this material if it contains a Transparent BSDF, "
"disabling will render faster but not give accurate shadows",
default=True,
)
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2013-06-18 22:33:54 UTC (rev 57559)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-06-18 22:34:37 UTC (rev 57560)
@@ -917,13 +917,15 @@
col = split.column()
col.prop(mat, "diffuse_color", text="Viewport Color")
- col = split.column()
+ col = split.column(align=True)
+ col.label()
col.prop(mat, "pass_index")
+
+ col = layout.column()
+ col.prop(cmat, "sample_as_light")
col.prop(cmat, "use_transparent_shadow")
- layout.prop(cmat, "sample_as_light")
-
class CyclesTexture_PT_context(CyclesButtonsPanel, Panel):
bl_label = ""
bl_context = "texture"
More information about the Bf-blender-cvs
mailing list