diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 21:14:23 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 21:14:23 +0400 |
commit | ebfafc77ebf8c4059a281bd9b12b879253c85549 (patch) | |
tree | d4b8a9665bce56a05d2bf11fdc0b5ef2bd93e764 /source/blender | |
parent | a8081c1d2bb9115833493b011bb93d6c08112b2d (diff) |
fix for error in merge 43462
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_uv.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index 229ef10159e..4023797b11a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -634,14 +634,12 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, wmEvent /* 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); diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 6a9dda3e1f8..38c8f5bc69c 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -1097,7 +1097,7 @@ static int stitch_init(bContext *C, wmOperator *op) 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; |