[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40619] branches/soc-2011-onion-uv-tools: *correct keymaps for uv sculpting according to recent file structure change

[Antony Riakiotakis]

Revision: 40619
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40619
Author:   psy-fi
Date:     2011-09-27 14:17:36 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
*correct keymaps for uv sculpting according to recent file structure change
*some more keymap corrections
*Erase full stops from operator property descriptions

will need some more tweaking to make keymap work, coming ASAP

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_keymap.c

Modified: branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/keyconfig_utils.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/keyconfig_utils.py	2011-09-27 13:33:32 UTC (rev 40618)
+++ branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/keyconfig_utils.py	2011-09-27 14:17:36 UTC (rev 40619)
@@ -70,6 +70,7 @@
     ('Image', 'IMAGE_EDITOR', 'WINDOW', [
         ('UV Editor', 'EMPTY', 'WINDOW', []),  # image (reverse order, UVEdit before Image
         ('Image Paint', 'EMPTY', 'WINDOW', []),  # image and view3d
+        ('UV Sculpt', 'IMAGE_EDITOR', 'WINDOW', []),
         ('Image Generic', 'IMAGE_EDITOR', 'WINDOW', [])
         ]),
 

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c	2011-09-27 13:33:32 UTC (rev 40618)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c	2011-09-27 14:17:36 UTC (rev 40619)
@@ -2951,10 +2951,10 @@
 	ot->poll= ED_operator_uvedit;
 
 	/* properties */
-	RNA_def_boolean(ot->srna, "use_limit", 0, "Use Limit", "Stitch UVs within a specified limit distance.");
+	RNA_def_boolean(ot->srna, "use_limit", 0, "Use Limit", "Stitch UVs within a specified limit distance");
 	RNA_def_boolean(ot->srna, "snap_islands", 0, "Snap Islands", "Snap islands together. On edge stitch mode, rotates the islands too");
 	RNA_def_enum(ot->srna, "mode", mode, VERT_STITCH, "Mode", "Vertex or edge stitching mode. In Edge stitching, both uv's must be stitchable to stitch");
-	RNA_def_float(ot->srna, "limit", 0.01f, 0.0f, FLT_MAX, "Limit", "Limit distance in normalized coordinates.", 0.0, FLT_MAX);
+	RNA_def_float(ot->srna, "limit", 0.01f, 0.0f, FLT_MAX, "Limit", "Limit distance in normalized coordinates", 0.0, FLT_MAX);
 	RNA_def_int(ot->srna, "static_island", 0, 0, INT_MAX, "Static Island",  "Island that stays in place when stitching islands", 0, INT_MAX);
 }
 
@@ -4970,7 +4970,7 @@
 
 	RNA_def_boolean(ot->srna, "selection", 0, "Selection", "Mark edge seams for selection");
 	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX,
-		"Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds.", -100.0f, 100.0f);
+		"Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds", -100.0f, 100.0f);
 }
 
 /* ************************** registration **********************************/

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2011-09-27 13:33:32 UTC (rev 40618)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2011-09-27 14:17:36 UTC (rev 40619)
@@ -1257,7 +1257,7 @@
 	                "Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry");
 	RNA_def_boolean(ot->srna, "correct_aspect", 1, "Correct Aspect",
 	                "Map UVs taking image aspect ratio into account");
-	RNA_def_boolean(ot->srna, "use_subsurf_data", 0, "Use Subsurf Data", "Map UV's taking vertex position after subsurf into account.");
+	RNA_def_boolean(ot->srna, "use_subsurf_data", 0, "Use Subsurf Data", "Map UV's taking vertex position after subsurf into account");
 	RNA_def_int(ot->srna, "uv_subsurf_level", 1, 1, 6, "SubSurf Target", "Number of times to subdivide before calculating UV's", 1, 6);
 }
 

Modified: branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_keymap.c	2011-09-27 13:33:32 UTC (rev 40618)
+++ branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_keymap.c	2011-09-27 14:17:36 UTC (rev 40619)
@@ -1227,7 +1227,14 @@
 		km = WM_keymap_find_all(C, "Pose", 0, 0);
 	}
 	else if (strstr(opname, "SCULPT_OT")) {
-		km = WM_keymap_find_all(C, "Sculpt", 0, 0);
+		switch(CTX_data_mode_enum(C)) {
+			case OB_MODE_SCULPT:
+				km = WM_keymap_find_all(C, "Sculpt", 0, 0);
+				break;
+			case OB_MODE_EDIT:
+				km = WM_keymap_find_all(C, "UV Sculpt", 0, 0);
+				break;
+		}
 	}
 	else if (strstr(opname, "MBALL_OT")) {
 		km = WM_keymap_find_all(C, "Metaball", 0, 0);
@@ -1259,9 +1266,6 @@
 			case OB_MODE_TEXTURE_PAINT:
 				km = WM_keymap_find_all(C, "Image Paint", 0, 0);
 				break;
-			case OB_MODE_EDIT:
-				km = WM_keymap_find_all(C, "UV Sculpt", 0, 0);
-				break;
 		}
 	}
 	/* Paint Face Mask */