[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30699] branches/soc-2010-nicolasbishop: = = Multires ==
Nicholas Bishop
nicholasbishop at gmail.com
Sat Jul 24 22:49:10 CEST 2010
Revision: 30699
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30699
Author: nicholasbishop
Date: 2010-07-24 22:49:10 +0200 (Sat, 24 Jul 2010)
Log Message:
-----------
== Multires ==
* Renamed Sculpt Level to Edit Level (works now for vpaint too)
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_modifier.c
Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py 2010-07-24 20:39:31 UTC (rev 30698)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py 2010-07-24 20:49:10 UTC (rev 30699)
@@ -435,7 +435,7 @@
split = layout.split()
col = split.column()
col.prop(md, "levels", text="Preview")
- col.prop(md, "sculpt_levels", text="Sculpt")
+ col.prop(md, "edit_levels", text="Edit")
col.prop(md, "render_levels", text="Render")
col.prop(bpy.context.tool_settings.sculpt, "fast_navigate")
Modified: branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c 2010-07-24 20:39:31 UTC (rev 30698)
+++ branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c 2010-07-24 20:49:10 UTC (rev 30699)
@@ -99,7 +99,7 @@
{
if(render)
return (mmd->modifier.scene)? get_render_subsurf_level(&mmd->modifier.scene->r, mmd->renderlvl): mmd->renderlvl;
- else if(ob->mode == OB_MODE_SCULPT)
+ else if(ob->mode & (OB_MODE_SCULPT|OB_MODE_VERTEX_PAINT))
return mmd->sculptlvl;
else
return (mmd->modifier.scene)? get_render_subsurf_level(&mmd->modifier.scene->r, mmd->lvl): mmd->lvl;
Modified: branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_modifier.c 2010-07-24 20:39:31 UTC (rev 30698)
+++ branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_modifier.c 2010-07-24 20:49:10 UTC (rev 30699)
@@ -585,9 +585,9 @@
RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MultiresModifier_level_range");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
- prop= RNA_def_property(srna, "sculpt_levels", PROP_INT, PROP_UNSIGNED);
+ prop= RNA_def_property(srna, "edit_levels", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "sculptlvl");
- RNA_def_property_ui_text(prop, "Sculpt Levels", "Number of subdivisions to use in sculpt mode");
+ RNA_def_property_ui_text(prop, "Edit Levels", "Number of subdivisions to use in sculpt and paint modes");
RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MultiresModifier_level_range");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
More information about the Bf-blender-cvs
mailing list