[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30854] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/sculpt.c: * Fix: grab brush got foobar' d by a previous merge

Jason Wilkins Jason.A.Wilkins at gmail.com
Thu Jul 29 02:34:55 CEST 2010


Revision: 30854
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30854
Author:   jwilkins
Date:     2010-07-29 02:34:55 +0200 (Thu, 29 Jul 2010)

Log Message:
-----------
* Fix: grab brush got foobar'd by a previous merge

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-29 00:06:22 UTC (rev 30853)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-29 00:34:55 UTC (rev 30854)
@@ -3239,10 +3239,13 @@
 	if(brush->sculpt_tool == SCULPT_TOOL_GRAB) {
 		float grab_location[3], imat[4][4];
 
-		cache->radius= unproject_brush_radius(ss->ob, paint_stroke_view_context(stroke), cache->true_location, cache->pixel_radius);
-		cache->radius_squared = cache->radius*cache->radius;
+		if(cache->first_time)
+			copy_v3_v3(cache->orig_grab_location, cache->true_location);
 
-		copy_v3_v3(sd->anchored_location, cache->true_location);
+		/* compute 3d coordinate at same z from original location + mouse */
+		initgrabz(cache->vc->rv3d, cache->orig_grab_location[0],
+			cache->orig_grab_location[1], cache->orig_grab_location[2]);
+		window_to_3d_delta(cache->vc->ar, grab_location, cache->mouse[0], cache->mouse[1]);
 
 		/* compute delta to move verts by */
 		if(!cache->first_time) {





More information about the Bf-blender-cvs mailing list