Revision: 40860
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40860
Author: psy-fi
Date: 2011-10-08 22:24:28 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Rename "High Resolution Texures" to "High Bit Depth Textures". I realize this
is a bit contradictory..."Deep bit depth" though sounds a bit non-technical.
In any case, this was causing some confusion to people thinking that it's some
tiled memory manager for textures which, unfortunately, is not true.
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/resources.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
Modified:
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
---
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
2011-10-08 20:38:41 UTC (rev 40859)
+++
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
2011-10-08 22:24:28 UTC (rev 40860)
@@ -423,7 +423,7 @@
col.label(text="OpenGL:")
col.prop(system, "gl_clip_alpha", slider=True)
col.prop(system, "use_mipmaps")
- col.prop(system, "use_highres_tex")
+ col.prop(system, "use_high_bit_depth_tex")
col.label(text="Anisotropic Filtering")
col.prop(system, "anisotropic_filter", text="")
col.prop(system, "use_vertex_buffer_objects")
Modified:
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/resources.c
===================================================================
---
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/resources.c
2011-10-08 20:38:41 UTC (rev 40859)
+++
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/resources.c
2011-10-08 22:24:28 UTC (rev 40860)
@@ -1647,7 +1647,7 @@
SETCOLF(btheme->tima.preview_stitch_stitchable, 0.0,
1.0, 0.0, 1.0);
SETCOLF(btheme->tima.preview_stitch_unstitchable, 1.0,
0.0, 0.0, 1.0);
}
- U.hirestex = 0;
+ U.high_bit_depth_tex = 0;
}
/* GL Texture Garbage Collection (variable abused above!) */
Modified: branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_draw.c
2011-10-08 20:38:41 UTC (rev 40859)
+++ branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_draw.c
2011-10-08 22:24:28 UTC (rev 40860)
@@ -484,7 +484,7 @@
if (ibuf->rect_float){
/*replace with user preference when ready :)*/
- if(U.hirestex)
+ if(U.high_bit_depth_tex)
{
/*Use high precision textures. This is relatively
harmless because OpenGL gives us
a high precision format only if it is available*/
Modified:
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
===================================================================
---
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
2011-10-08 20:38:41 UTC (rev 40859)
+++
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
2011-10-08 22:24:28 UTC (rev 40860)
@@ -384,7 +384,7 @@
short widget_unit; /* defaults to 20 for 72 DPI setting */
short anisotropic_filter;
- short hirestex, pad8[3];
+ short high_bit_depth_tex, pad8[3];
float ndof_sensitivity; /* overall sensitivity of 3D mouse */
int ndof_flag; /* flags for 3D mouse */
Modified:
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
===================================================================
---
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
2011-10-08 20:38:41 UTC (rev 40859)
+++
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
2011-10-08 22:24:28 UTC (rev 40860)
@@ -140,7 +140,7 @@
rna_userdef_update(bmain, scene, ptr);
}
-static void rna_userdef_gl_use_texture_highres(Main *bmain, Scene *scene,
PointerRNA *ptr)
+static void rna_userdef_gl_high_bit_depth_tex(Main *bmain, Scene *scene,
PointerRNA *ptr)
{
GPU_free_images();
rna_userdef_update(bmain, scene, ptr);
@@ -2698,10 +2698,10 @@
"Scale textures for the 3D View (looks nicer
but uses more memory and slows image reloading)");
RNA_def_property_update(prop, 0, "rna_userdef_mipmap_update");
- prop= RNA_def_property(srna, "use_highres_tex", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "hirestex", 1);
- RNA_def_property_ui_text(prop, "High Resolution Float Textures", "Use
16 bit per component texture for float images.");
- RNA_def_property_update(prop, 0, "rna_userdef_gl_use_texture_highres");
+ prop= RNA_def_property(srna, "use_high_bit_depth_tex", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "high_bit_depth_tex", 1);
+ RNA_def_property_ui_text(prop, "High Bit Depth Float Textures", "Use 16
bit per component texture for float images.");
+ RNA_def_property_update(prop, 0, "rna_userdef_gl_high_bit_depth_tex");
prop= RNA_def_property(srna, "use_vertex_buffer_objects", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags",
USER_DISABLE_VBO);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
