[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54675] trunk/blender/source/blender/ editors/transform/transform_snap.c: fix [#34244] Snap to face projection - Entire mesh is affected by projection when Proportional Editing mode is active , regardless of influence radius

Campbell Barton ideasman42 at gmail.com
Tue Feb 19 17:57:04 CET 2013


Revision: 54675
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54675
Author:   campbellbarton
Date:     2013-02-19 16:57:04 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
fix [#34244] Snap to face projection - Entire mesh is affected by projection when Proportional Editing mode is active, regardless of influence radius

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_snap.c

Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c	2013-02-19 16:13:41 UTC (rev 54674)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c	2013-02-19 16:57:04 UTC (rev 54675)
@@ -303,6 +303,9 @@
 			
 			if (td->flag & TD_SKIP)
 				continue;
+
+			if ((t->flag & T_PROP_EDIT) && (td->factor == 0.0f))
+				continue;
 			
 			copy_v3_v3(iloc, td->loc);
 			if (t->flag & (T_EDIT | T_POSE)) {
@@ -325,7 +328,14 @@
 
 					mul_m3_v3(td->smtx, tvec);
 
-					add_v3_v3(td->loc, tvec);
+					if ((t->flag & T_PROP_EDIT) == 0) {
+						add_v3_v3(td->loc, tvec);
+					}
+					else {
+						add_v3_v3(tvec, td->loc);
+						interp_v3_v3v3(td->loc, td->loc, tvec, td->factor);
+					}
+
 				}
 			}
 			




More information about the Bf-blender-cvs mailing list