Commit: 0e41965f7682761b6537e741cf0dcaeedb75660a
Author: Antony Riakiotakis
Date: Mon Dec 29 12:57:28 2014 +0100
Branches: vertex_paint_pbvh
https://developer.blender.org/rB0e41965f7682761b6537e741cf0dcaeedb75660a
Cleanup and compile fix after merge
===================================================================
M source/blender/editors/sculpt_paint/paint_vertex_pbvh.c
M source/blender/editors/sculpt_paint/sculpt.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_pbvh.c
b/source/blender/editors/sculpt_paint/paint_vertex_pbvh.c
index a3b73c6..3d7725e 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_pbvh.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_pbvh.c
@@ -351,7 +351,7 @@ static int vpaint_mode_toggle_exec(bContext *C, wmOperator
*op)
paint_cursor_start(C, vertex_paint_poll);
- BKE_paint_init(&vp->paint, PAINT_CURSOR_VERTEX_PAINT);
+ BKE_paint_init(&scene->toolsettings->unified_paint_settings,
&vp->paint, PAINT_CURSOR_VERTEX_PAINT);
}
/* update modifier stack for mapping requirements */
diff --git a/source/blender/editors/sculpt_paint/sculpt.c
b/source/blender/editors/sculpt_paint/sculpt.c
index 16eda3f..ef7a65a 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -4125,7 +4125,6 @@ static bool sculpt_brush_stroke_init(bContext *C,
wmOperator *op)
Object *ob = CTX_data_active_object(C);
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
PaintSession *psession = CTX_data_active_object(C)->paint;
- SculptSession *ss = psession->sculpt;
Brush *brush = BKE_paint_brush(&sd->paint);
int mode = RNA_enum_get(op->ptr, "mode");
bool is_smooth;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
