griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- added ramp diffuse & spec factor rna props

Browse Source 
- made 3dspace camera editable
- convert in object menu
This commit is contained in:
Campbell Barton
2009-10-09 14:35:54 +00:00
parent cbd5117432
commit 8c96e2f4d2
4 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/ui/buttons_material.py
View File

@@ -306,6 +306,8 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel):
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 @@ class MATERIAL_PT_specular(MaterialButtonsPanel):
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"

2
release/scripts/ui/space_view3d.py
View File

@@ -422,6 +422,8 @@ class VIEW3D_MT_object(bpy.types.Menu):
layout.itemM("VIEW3D_MT_object_showhide")
layout.item_menu_enumO("object.convert", "target")
class VIEW3D_MT_object_clear(bpy.types.Menu):
__label__ = "Clear"

11
source/blender/makesrna/intern/rna_material.c
View File

@@ -763,6 +763,17 @@ static void rna_def_material_colors(StructRNA *srna)
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)

1
source/blender/makesrna/intern/rna_space.c
View File

@@ -593,6 +593,7 @@ static void rna_def_space_3dview(BlenderRNA *brna)
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);