kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Added back texture filter/minimum settings to image texture properties

Browse Source
This commit is contained in:
Matt Ebb 2009-11-02 09:31:55 +00:00
parent a9f6eaf847
commit 27580daf27
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -519,11 +519,13 @@ class TEXTURE_PT_image_sampling(TextureTypePanel):
col.itemL(text="Filter:")
col.itemR(tex, "filter", text="")
col.itemR(tex, "filter_size")
col.itemR(tex, "filter_size_minimum")
col.itemR(tex, "mipmap")
row = col.row()
row.active = tex.mipmap
row.itemR(tex, "mipmap_gauss", text="Gauss")
row.itemR(tex, "mipmap_gauss")
col.itemR(tex, "interpolation")
if tex.mipmap and tex.filter != 'DEFAULT':

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

@ -620,10 +620,9 @@ static void rna_def_filter_size_common(StructRNA *srna)
{
PropertyRNA *prop;
/* XXX: not sure about the name of this, "Min" seems a bit off */
prop= RNA_def_property(srna, "use_filter", PROP_BOOLEAN, PROP_NONE);
prop= RNA_def_property(srna, "filter_size_minimum", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_FILTER_MIN);
RNA_def_property_ui_text(prop, "Use Filter", "Use Filter Size as a minimal filter value in pixels");
RNA_def_property_ui_text(prop, "Minimum Filter Size", "Use Filter Size as a minimal filter value in pixels");
RNA_def_property_update(prop, 0, "rna_Texture_update");
prop= RNA_def_property(srna, "filter_size", PROP_FLOAT, PROP_NONE);
@ -1062,7 +1061,7 @@ static void rna_def_texture_image(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem prop_normal_space[] = {
{MTEX_NSPACE_CAMERA, "CAMERA", 0, "Extend", ""},
{MTEX_NSPACE_CAMERA, "CAMERA", 0, "Camera", ""},
{MTEX_NSPACE_WORLD, "WORLD", 0, "World", ""},
{MTEX_NSPACE_OBJECT, "OBJECT", 0, "Object", ""},
{MTEX_NSPACE_TANGENT, "TANGENT", 0, "Tangent", ""},
@ -1080,7 +1079,7 @@ static void rna_def_texture_image(BlenderRNA *brna)
prop= RNA_def_property(srna, "mipmap_gauss", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_GAUSS_MIP);
RNA_def_property_ui_text(prop, "MIP Map Gauss", "Uses Gauss filter to sample down MIP maps");
RNA_def_property_ui_text(prop, "MIP Map Gaussian filter", "Uses Gauss filter to sample down MIP maps");
RNA_def_property_update(prop, 0, "rna_Texture_update");
prop= RNA_def_property(srna, "interpolation", PROP_BOOLEAN, PROP_NONE);