[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23741] trunk/blender: - added ramp diffuse & spec factor rna props

Campbell Barton ideasman42 at gmail.com
Fri Oct 9 16:35:55 CEST 2009


Revision: 23741
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23741
Author:   campbellbarton
Date:     2009-10-09 16:35:54 +0200 (Fri, 09 Oct 2009)

Log Message:
-----------
- added ramp diffuse & spec factor rna props
- made 3dspace camera editable
- convert in object menu

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/buttons_material.py
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/makesrna/intern/rna_material.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/release/scripts/ui/buttons_material.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_material.py	2009-10-09 13:56:35 UTC (rev 23740)
+++ trunk/blender/release/scripts/ui/buttons_material.py	2009-10-09 14:35:54 UTC (rev 23741)
@@ -306,6 +306,8 @@
 			split = row.split(percentage=0.3)
 			split.itemL(text="Blend:")
 			split.itemR(mat, "diffuse_ramp_blend", text="")
+			row = layout.row()
+			row.itemR(mat, "diffuse_ramp_factor", text="Factor")
 
 class MATERIAL_PT_specular(MaterialButtonsPanel):
 	__label__ = "Specular"
@@ -358,6 +360,8 @@
 			split = row.split(percentage=0.3)
 			split.itemL(text="Blend:")
 			split.itemR(mat, "specular_ramp_blend", text="")
+			row = layout.row()
+			row.itemR(mat, "specular_ramp_factor", text="Factor")
 		
 class MATERIAL_PT_sss(MaterialButtonsPanel):
 	__label__ = "Subsurface Scattering"

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2009-10-09 13:56:35 UTC (rev 23740)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2009-10-09 14:35:54 UTC (rev 23741)
@@ -422,6 +422,8 @@
 		
 		layout.itemM("VIEW3D_MT_object_showhide")
 		
+		layout.item_menu_enumO("object.convert", "target")
+		
 class VIEW3D_MT_object_clear(bpy.types.Menu):
 	__label__ = "Clear"
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_material.c	2009-10-09 13:56:35 UTC (rev 23740)
+++ trunk/blender/source/blender/makesrna/intern/rna_material.c	2009-10-09 14:35:54 UTC (rev 23741)
@@ -763,6 +763,17 @@
 	RNA_def_property_ui_text(prop, "Specular Ramp Input", "");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 
+	prop= RNA_def_property(srna, "diffuse_ramp_factor", PROP_FLOAT, PROP_FACTOR);
+	RNA_def_property_float_sdna(prop, NULL, "rampfac_col");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Diffuse Ramp Factor", "Blending factor (also uses alpha in Colorband).");
+	RNA_def_property_update(prop, 0, "rna_Material_update");
+
+	prop= RNA_def_property(srna, "specular_ramp_factor", PROP_FLOAT, PROP_FACTOR);
+	RNA_def_property_float_sdna(prop, NULL, "rampfac_spec");
+	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_ui_text(prop, "Specular Ramp Factor", "Blending factor (also uses alpha in Colorband).");
+	RNA_def_property_update(prop, 0, "rna_Material_update");
 }
 
 static void rna_def_material_diffuse(StructRNA *srna)

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2009-10-09 13:56:35 UTC (rev 23740)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2009-10-09 14:35:54 UTC (rev 23741)
@@ -593,6 +593,7 @@
 	RNA_def_struct_ui_text(srna, "3D View Space", "3D View space data");
 	
 	prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_pointer_sdna(prop, NULL, "camera");
 	RNA_def_property_ui_text(prop, "Camera", "Active camera used in this view (when unlocked from the scene's active camera).");
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, NULL);





More information about the Bf-blender-cvs mailing list