[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38253] branches/soc-2011-onion/source/ blender/editors: compile fix for recent change to use_orig_bb + a few defines for a bugfix coming soon

[Antony Riakiotakis]

Revision: 38253
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38253
Author:   psy-fi
Date:     2011-07-09 09:22:18 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
compile fix for recent change to use_orig_bb + a few defines for a bugfix coming soon

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c

Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c	2011-07-09 09:10:33 UTC (rev 38252)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c	2011-07-09 09:22:18 UTC (rev 38253)
@@ -2024,7 +2024,7 @@
 
 	search_data.center = center;
 	search_data.radius_squared = radius*radius;
-	search_data.original = 0;
+	search_data.use_orig_bb = 0;
 
 	BLI_pbvh_search_gather(ob->paint->pbvh, BLI_pbvh_search_sphere_cb,
 			       &search_data, &nodes, &totnode);

Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c	2011-07-09 09:10:33 UTC (rev 38252)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/sculpt.c	2011-07-09 09:22:18 UTC (rev 38253)
@@ -2670,7 +2670,7 @@
 	/* Build a list of all nodes that are potentially within the brush's area of influence */
 	data.center= ss->cache->location;
 	data.radius_squared= ss->cache->radius_squared;
-	data.original= ELEM4(brush->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_THUMB, SCULPT_TOOL_LAYER);
+	data.use_orig_bb= ELEM4(brush->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_THUMB, SCULPT_TOOL_LAYER);
 	BLI_pbvh_search_gather(ob->paint->pbvh, BLI_pbvh_search_sphere_cb, &data, &nodes, &totnode);
 
 	/* Only act if some verts are inside the brush area */

Modified: branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c	2011-07-09 09:10:33 UTC (rev 38252)
+++ branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c	2011-07-09 09:22:18 UTC (rev 38253)
@@ -1142,12 +1142,13 @@
 
 
 /*
- * defines for UvMapVert flags
+ * defines for UvElement flags
  */
 #define STITCH_PROCESSED 1
 #define STITCH_STITCHABLE 2
 #define STITCH_EDGE_PREVIEW 4
-#define STITCH_FOR_STITCHING 8
+#define STITCH_USE_FOR_STITCHING 8
+#define STITCH_DO_UPDATE 16
 
 
 /* Previewer stuff (see uvedit_intern.h for more info) */