Revision: 20146
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20146
Author: campbellbarton
Date: 2009-05-11 10:40:50 +0200 (Mon, 11 May 2009)
Log Message:
-----------
made the material button use the active objects material
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_material.py
branches/blender2.5/blender/source/blender/python/epy_doc_gen.py
Modified: branches/blender2.5/blender/release/ui/buttons_material.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_material.py 2009-05-11
06:55:11 UTC (rev 20145)
+++ branches/blender2.5/blender/release/ui/buttons_material.py 2009-05-11
08:40:50 UTC (rev 20146)
@@ -11,11 +11,13 @@
__label__ = "Material"
def draw(self, context):
- mat = context.main.materials[0]
- layout = self.layout
+ try: mat = context.active_object.active_material
+ except: mat = None
if not mat:
- return
+ return
+
+ layout = self.layout
layout.row()
layout.itemR(mat, "diffuse_color")
@@ -31,12 +33,14 @@
__label__ = "Subsurface Scattering"
def draw(self, context):
- sss = context.main.materials[0].subsurface_scattering
- layout = self.layout
+ try: sss =
context.active_object.active_material.subsurface_scattering
+ except: sss = None
if not sss:
return
+ layout = self.layout
+
layout.row()
layout.itemR(sss, "enabled", text="Enable")
@@ -60,12 +64,14 @@
__label__ = "Ray Mirror"
def draw(self, context):
- raym = context.main.materials[0].raytrace_mirror
- layout = self.layout
+ try: raym =
context.active_object.active_material.raytrace_mirror
+ except: raym = None
if not raym:
return
-
+
+ layout = self.layout
+
layout.row()
layout.itemR(raym, "enabled", text="Enable")
@@ -93,12 +99,14 @@
__idname__= "MATERIAL_PT_raytransp"
__label__= "Ray Transparency"
- def draw(self, context):
- rayt = context.main.materials[0].raytrace_transparency
- layout = self.layout
+ def draw(self, context):
+ try: rayt =
context.active_object.active_material.raytrace_transparency
+ except: rayt = None
if not rayt:
- return
+ return
+
+ layout = self.layout
layout.row()
layout.itemR(rayt, "enabled", text="Enable")
Modified: branches/blender2.5/blender/source/blender/python/epy_doc_gen.py
===================================================================
--- branches/blender2.5/blender/source/blender/python/epy_doc_gen.py
2009-05-11 06:55:11 UTC (rev 20145)
+++ branches/blender2.5/blender/source/blender/python/epy_doc_gen.py
2009-05-11 08:40:50 UTC (rev 20146)
@@ -26,11 +26,11 @@
This will generate rna.py and bpyoperator.py in "./source/blender/python/doc/"
Generate html docs by running...
- epydoc source/blender/python/doc/*.py -v \
- -o source/blender/python/doc/html \
- --inheritance=included \
- --no-sourcecode \
- --graph=classtree \
+ epydoc source/blender/python/doc/*.py -v \\
+ -o source/blender/python/doc/html \\
+ --inheritance=included \\
+ --no-sourcecode \\
+ --graph=classtree \\
--graph-font-size=8
'''
@@ -523,7 +523,7 @@
if __name__ == '__main__':
if 'bpy' not in dir():
- print("\nError, this script must run from inside blender.")
+ print("\nError, this script must run from inside blender2.5")
print(script_help_msg)
else:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
