[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43464] trunk/blender/source/blender/ editors: fix for error in merge 43462
Campbell Barton
ideasman42 at gmail.com
Tue Jan 17 18:14:30 CET 2012
Revision: 43464
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43464
Author: campbellbarton
Date: 2012-01-17 17:14:23 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
fix for error in merge 43462
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c 2012-01-17 17:08:32 UTC (rev 43463)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c 2012-01-17 17:14:23 UTC (rev 43464)
@@ -634,14 +634,12 @@
/* Allocate initial selection for grab tool */
if(ts->uv_sculpt_tool == UV_SCULPT_TOOL_GRAB){
float radius, radius_root;
- unsigned int tool;
UvSculptData *sculptdata = (UvSculptData *)op->customdata;
SpaceImage *sima;
int width, height;
float aspectRatio;
float alpha, zoomx, zoomy;
Brush *brush = paint_brush(sculptdata->uvsculpt);
- tool = CTX_data_scene(C)->toolsettings->uv_sculpt_tool;
alpha = brush_alpha(scene, brush);
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c 2012-01-17 17:08:32 UTC (rev 43463)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c 2012-01-17 17:14:23 UTC (rev 43464)
@@ -1097,7 +1097,7 @@
state->selection_size = 0;
/* Load old selection if redoing operator with different settings */
- if(RNA_property_is_set(op->ptr, "selection")){
+ if(RNA_struct_property_is_set(op->ptr, "selection")){
int faceIndex, elementIndex;
UvElement *element;
More information about the Bf-blender-cvs
mailing list