[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24232] trunk/blender: Added back texture filter/minimum settings to image texture properties

[Matt Ebb]

Revision: 24232
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24232
Author:   broken
Date:     2009-11-02 10:31:55 +0100 (Mon, 02 Nov 2009)

Log Message:
-----------
Added back texture filter/minimum settings to image texture properties

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_texture.py
    trunk/blender/source/blender/makesrna/intern/rna_texture.c

Modified: trunk/blender/release/scripts/ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_texture.py	2009-11-02 09:26:55 UTC (rev 24231)
+++ trunk/blender/release/scripts/ui/properties_texture.py	2009-11-02 09:31:55 UTC (rev 24232)
@@ -519,11 +519,13 @@
 
         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':

Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c	2009-11-02 09:26:55 UTC (rev 24231)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c	2009-11-02 09:31:55 UTC (rev 24232)
@@ -620,10 +620,9 @@
 {
 	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 @@
 		{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 @@
 
 	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);