Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2013-05-18 19:51:40 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-05-18 19:51:40 +0400
commitef40cdc1671ce1fb21e8ac52bfe6369d47868902 (patch)
treeb26628ba5af210d4f41c6e43f21f73069b400146 /source/blender/editors/sculpt_paint
parent1c314aae73342995bf47622bc48b518f8d71b402 (diff)
Fix crash due to shared paint cursor function. It is necessary to check
if we really are in sculpt mode context since the active object may be in sculpt mode while cursor is in the 2d paint editor.
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r--source/blender/editors/sculpt_paint/paint_cursor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index 107ff9668f0..79b8cd5e695 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -809,7 +809,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
/* TODO: as sculpt and other paint modes are unified, this
* special mode of drawing will go away */
- if (vc.obact && vc.obact->sculpt) {
+ if ((mode == PAINT_SCULPT) && vc.obact->sculpt) {
float location[3];
int pixel_radius, hit;