diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-21 01:47:10 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-21 01:47:10 +0400 |
| commit | 6e56db8ce26ce107a4123e21ba222fb897ba340c (patch) | |
| tree | fceaa8c5ca28e7e9c759768de3e32e795358ec75 | |
| parent | 31da72545ed014e7f91dc945e693d5d7e65a3bf2 (diff) | |
Paint system
* Add unified color settings to brush menus.
* Add notifier on fill tool from drag and drop to refresh icons
| -rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 8fd0ded17f7..c90e4cdf3e9 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -154,6 +154,7 @@ class IMAGE_MT_brush(Menu): ups = context.tool_settings.unified_paint_settings layout.prop(ups, "use_unified_size", text="Unified Size") layout.prop(ups, "use_unified_strength", text="Unified Strength") + layout.prop(ups, "use_unified_color", text="Unified Color") layout.separator() # brush tool diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 1e2fac17e90..3d0e767f5e1 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1424,6 +1424,8 @@ class VIEW3D_MT_brush(Menu): ups = context.tool_settings.unified_paint_settings layout.prop(ups, "use_unified_size", text="Unified Size") layout.prop(ups, "use_unified_strength", text="Unified Strength") + if context.image_paint_object or context.vertex_paint_object: + layout.prop(ups, "use_unified_color", text="Unified Color") layout.separator() # brush paint modes diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 7c19528a049..f83dd3d7e82 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -1482,12 +1482,17 @@ void PAINT_OT_brush_colors_flip(wmOperatorType *ot) void ED_imapaint_bucket_fill(struct bContext *C, float color[3], wmOperator *op) { + SpaceImage *sima = CTX_wm_space_image(C); + Image *ima = sima->image; + ED_undo_paint_push_begin(UNDO_PAINT_IMAGE, op->type->name, ED_image_undo_restore, ED_image_undo_free, NULL); paint_2d_bucket_fill(C, color, NULL, NULL, NULL); ED_undo_paint_push_end(UNDO_PAINT_IMAGE); + + DAG_id_tag_update(&ima->id, 0); } |