diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-21 13:39:21 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-21 13:39:21 +0400 |
| commit | f59afb5f998d98f2039e9f4278ff7773815a3029 (patch) | |
| tree | aeef5352e80f245c7b7eaf64ca02cca732ac0dec /source/blender/editors/sculpt_paint/paint_ops.c | |
| parent | 2ea8a71d877f55f229b75fcfbff5fd9eff801629 (diff) | |
Unified size only works for sculpt, so only modify it in sculpt mode.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_ops.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 5e2d5f46800..fa9aae1a1e7 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -78,10 +78,11 @@ static int brush_scale_size_exec(bContext *C, wmOperator *op) /*int type = RNA_enum_get(op->ptr, "type");*/ Paint *paint = paint_get_active(CTX_data_scene(C)); Brush *br = paint_brush(paint); + Object *ob = CTX_data_active_object(C); float factor = RNA_float_get(op->ptr, "scalar"); if (br) { - if (U.sculpt_paint_settings & SCULPT_PAINT_USE_UNIFIED_SIZE) { + if (ob && (ob->mode & OB_MODE_SCULPT) && (U.sculpt_paint_settings & SCULPT_PAINT_USE_UNIFIED_SIZE)) { U.sculpt_paint_unified_size *= factor; } else { |