[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14358] trunk/blender/source/blender/src: Proper fix for camera transform with snap.

[Martin Poirier]

Revision: 14358
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14358
Author:   theeth
Date:     2008-04-08 15:40:05 +0200 (Tue, 08 Apr 2008)

Log Message:
-----------
Proper fix for camera transform with snap.

Please email me or report a bug when such problem arise, it's simpler if done properly the first time.

Modified Paths:
--------------
    trunk/blender/source/blender/src/transform_constraints.c
    trunk/blender/source/blender/src/transform_snap.c

Modified: trunk/blender/source/blender/src/transform_constraints.c
===================================================================
--- trunk/blender/source/blender/src/transform_constraints.c	2008-04-08 12:58:25 UTC (rev 14357)
+++ trunk/blender/source/blender/src/transform_constraints.c	2008-04-08 13:40:05 UTC (rev 14358)
@@ -245,7 +245,7 @@
 		Mat3MulVecfl(t->con.pmtx, out);
 		
 		// With snap, a projection is alright, no need to correct for view alignment
-		if (((t->tsnap.status & SNAP_ON) && (G.qual & LR_CTRLKEY)) == 0 ) {
+		if ((t->tsnap.status & SNAP_ON) == 0) {
 			if (getConstraintSpaceDimension(t) == 2) {
 				if (out[0] != 0.0f || out[1] != 0.0f || out[2] != 0.0f) {
 					planeProjection(t, in, out);

Modified: trunk/blender/source/blender/src/transform_snap.c
===================================================================
--- trunk/blender/source/blender/src/transform_snap.c	2008-04-08 12:58:25 UTC (rev 14357)
+++ trunk/blender/source/blender/src/transform_snap.c	2008-04-08 13:40:05 UTC (rev 14358)
@@ -231,7 +231,8 @@
 {
 	resetSnapping(t);
 	
-	if (t->spacetype == SPACE_VIEW3D || t->spacetype == SPACE_IMAGE) { // Only 3D view or UV
+	if ((t->spacetype == SPACE_VIEW3D || t->spacetype == SPACE_IMAGE) && // Only 3D view or UV
+			(t->flag & T_CAMERA) == 0) { // Not with camera selected
 		setSnappingCallback(t);
 
 		/* Edit mode */