[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46843] branches/soc-2012-bratwurst: Maintain image transform tool

[Antony Riakiotakis]

Revision: 46843
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46843
Author:   psy-fi
Date:     2012-05-21 14:05:39 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Maintain image transform tool
===============================
GUI and RNA options for retain image transform tool. This is known as
"preserve UVs" in other programs, but I find this terminology deceptive
because UVs are, in fact, modified. It is actually the image that is
maintained on the mesh.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-05-21 13:42:58 UTC (rev 46842)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-05-21 14:05:39 UTC (rev 46843)
@@ -207,6 +207,8 @@
         col.label("Edge Select Mode:")
         col.prop(tool_settings, "edge_path_mode", text="")
         col.prop(tool_settings, "edge_path_live_unwrap")
+        col.prop(tool_settings, "retain_image_pos")
+
         col.label("Double Threshold:")
         col.prop(tool_settings, "double_threshold", text="")
 

Modified: branches/soc-2012-bratwurst/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/makesdna/DNA_scene_types.h	2012-05-21 13:42:58 UTC (rev 46842)
+++ branches/soc-2012-bratwurst/source/blender/makesdna/DNA_scene_types.h	2012-05-21 14:05:39 UTC (rev 46843)
@@ -989,7 +989,8 @@
 	short snap_flag, snap_target;
 	short proportional, prop_mode;
 	char proportional_objects; /* proportional edit, object mode */
-	char pad[5];
+	char retain_image_pos;
+	char pad[4];
 
 	char auto_normalize; /*auto normalizing mode in wpaint*/
 	char multipaint; /* paint multiple bones in wpaint */

Modified: branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c	2012-05-21 13:42:58 UTC (rev 46842)
+++ branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c	2012-05-21 14:05:39 UTC (rev 46843)
@@ -1635,7 +1635,11 @@
 	RNA_def_property_ui_text(prop, "Project to Self", "Snap onto itself (editmode)");
 	RNA_def_property_ui_icon(prop, ICON_ORTHO, 0);
 	RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */
-	
+
+	prop= RNA_def_property(srna, "retain_image_pos", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "retain_image_pos", 1);
+	RNA_def_property_ui_text(prop, "Retain Image", "Retain image position when transforming a vertex");
+
 	/* Grease Pencil */
 	prop = RNA_def_property(srna, "use_grease_pencil_sessions", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gpencil_flags", GP_TOOL_FLAG_PAINTSESSIONS_ON);