[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37283] branches/soc-2011-onion: Revision: 30699

[Jason Wilkins]

Revision: 37283
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37283
Author:   jwilkins
Date:     2011-06-07 00:05:48 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Revision: 30699
Author: nicholasbishop
Date: 3:49:10 PM, Saturday, July 24, 2010
Message:
== Multires ==

* Renamed Sculpt Level to Edit Level (works now for vpaint too)

Modified Paths:
--------------
    branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-onion/source/blender/makesrna/intern/rna_modifier.c

Property Changed:
----------------
    branches/soc-2011-onion/


Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30676,30692-30693,30696
/trunk/blender:36833-37206
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30676,30692-30693,30696,30699
/trunk/blender:36833-37206

Modified: branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_modifier.py	2011-06-06 23:35:24 UTC (rev 37282)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_modifier.py	2011-06-07 00:05:48 UTC (rev 37283)
@@ -384,7 +384,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 = split.column()

Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c	2011-06-06 23:35:24 UTC (rev 37282)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c	2011-06-07 00:05:48 UTC (rev 37283)
@@ -137,7 +137,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-2011-onion/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/soc-2011-onion/source/blender/makesrna/intern/rna_modifier.c	2011-06-06 23:35:24 UTC (rev 37282)
+++ branches/soc-2011-onion/source/blender/makesrna/intern/rna_modifier.c	2011-06-07 00:05:48 UTC (rev 37283)
@@ -746,9 +746,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");