[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25250] trunk/blender: Fix for bug #20307: snapping in uv editor is related to objects origin.

[Brecht Van Lommel]

Revision: 25250
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25250
Author:   blendix
Date:     2009-12-09 18:32:54 +0100 (Wed, 09 Dec 2009)

Log Message:
-----------
Fix for bug #20307: snapping in uv editor is related to objects origin.
Also updated image window header to use snap element property.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_image.py
    trunk/blender/source/blender/editors/transform/transform_snap.c

Modified: trunk/blender/release/scripts/ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/ui/space_image.py	2009-12-09 17:18:39 UTC (rev 25249)
+++ trunk/blender/release/scripts/ui/space_image.py	2009-12-09 17:32:54 UTC (rev 25250)
@@ -288,8 +288,7 @@
 
             row = layout.row(align=True)
             row.prop(settings, "snap", text="")
-            if settings.snap:
-                row.prop(settings, "snap_mode", text="")
+            row.prop(settings, "snap_element", text="", icon_only=True)
 
             # mesh = context.edit_object.data
             # row.prop_object(mesh, "active_uv_layer", mesh, "uv_textures")

Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c	2009-12-09 17:18:39 UTC (rev 25249)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c	2009-12-09 17:32:54 UTC (rev 25250)
@@ -838,8 +838,6 @@
 			t->tsnap.snapPoint[0] *= aspx;
 			t->tsnap.snapPoint[1] *= aspy;
 
-			mul_m4_v3(t->obedit->obmat, t->tsnap.snapPoint);
-			
 			t->tsnap.status |=  POINT_INIT;
 		}
 		else