bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

RNA/button tweaks:

Browse Source 
* Texture -> renamed 'no rgb' to 'rgb to intensity' (btw it's not just for
 image textures )

* Render -> stamp closed by default - not taking effect, because saved in 
.B.blend. How do we fix this? 

* Material -> removed 'Buffer Bias' dependency - it's for receiving shadows,
not casting them

* Material -> Ray Shadow bias renamed 'Auto Ray bias' - switches between an
 automatically calculated value vs the specified value
This commit is contained in:
Matt Ebb 2009-07-14 04:13:04 +00:00
parent 8f98c5e873
commit 0bfc98706e
6 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/ui/buttons_material.py
View File

@ -142,14 +142,12 @@ class MATERIAL_PT_options(MaterialButtonsPanel):
sub.itemR(mat, "cast_shadows_only", text="Cast Only")
sub.itemR(mat, "shadow_casting_alpha", text="Casting Alpha", slider=True)
sub.itemR(mat, "ray_shadow_bias")
sub.itemR(mat, "ray_shadow_bias", text="Auto Ray Bias")
colsub = sub.column()
colsub.active = mat.ray_shadow_bias
colsub.itemR(mat, "shadow_ray_bias", text="Raytracing Bias")
colsub.active = not mat.ray_shadow_bias
colsub.itemR(mat, "shadow_ray_bias", text="Ray Shadow Bias")
sub.itemR(mat, "cast_buffer_shadows")
colsub = sub.column()
colsub.active = mat.cast_buffer_shadows
colsub.itemR(mat, "shadow_buffer_bias", text="Buffer Bias")
sub.itemR(mat, "shadow_buffer_bias", text="Buffer Bias")
class MATERIAL_PT_diffuse(MaterialButtonsPanel):
__idname__= "MATERIAL_PT_diffuse"

1
release/ui/buttons_scene.py
View File

@ -371,6 +371,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel):
class RENDER_PT_stamp(RenderButtonsPanel):
__label__ = "Stamp"
__default_closed__ = True
def draw_header(self, context):
rd = context.scene.render_data

14
release/ui/buttons_texture.py
View File

@ -140,15 +140,11 @@ class TEXTURE_PT_influence(TextureButtonsPanel):
colsub.active = tex.map_color
colsub.itemR(tex, "color_factor", text="Opacity", slider=True)
colsub.itemR(tex, "blend_type")
if textype.type == 'IMAGE':
col.itemR(tex, "no_rgb")
colsub = col.column()
colsub.active = tex.no_rgb
colsub.itemR(tex, "color")
else:
col.itemR(tex, "color")
col.itemR(tex, "rgb_to_intensity")
colsub = col.column()
colsub.active = tex.rgb_to_intensity
colsub.itemR(tex, "color")
col.itemR(tex, "map_colorspec")
col.itemR(tex, "map_normal")
colsub = col.column()

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

@ -456,7 +456,7 @@ static void rna_def_material_raymirror(BlenderRNA *brna)
prop= RNA_def_property(srna, "fresnel_fac", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "fresnel_mir_i");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_range(prop, 0.0f, 5.0f);
RNA_def_property_ui_text(prop, "Fresnel Factor", "Blending factor for Fresnel.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);

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

@ -544,6 +544,10 @@ static void rna_def_space_3dview(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_SOLID_TEX);
RNA_def_property_ui_text(prop, "Textured Solid", "Display face-assigned textures in solid view");
prop= RNA_def_property(srna, "display_background_image", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_DISPBGPIC);
RNA_def_property_ui_text(prop, "Display Background Image", "Display a reference image behind objects in the 3D View");
prop= RNA_def_property(srna, "pivot_point", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "around");
RNA_def_property_enum_items(prop, pivot_items);

4
source/blender/makesrna/intern/rna_texture.c
View File

@ -270,9 +270,9 @@ static void rna_def_mtex(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Negate", "Inverts the values of the texture to reverse its effect.");
RNA_def_property_update(prop, NC_TEXTURE, NULL);
prop= RNA_def_property(srna, "no_rgb", PROP_BOOLEAN, PROP_NONE);
prop= RNA_def_property(srna, "rgb_to_intensity", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_RGBTOINT);
RNA_def_property_ui_text(prop, "No RGB", "Converts texture RGB values to intensity (gray) values.");
RNA_def_property_ui_text(prop, "RGB to Intensity", "Converts texture RGB values to intensity (gray) values.");
RNA_def_property_update(prop, NC_TEXTURE, NULL);
prop= RNA_def_property(srna, "default_value", PROP_FLOAT, PROP_VECTOR);