blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Paint system 

* Add unified color settings to brush menus.
* Add notifier on fill tool from drag and drop to refresh icons
This commit is contained in:
Antonis Ryakiotakis 2014-09-20 23:47:10 +02:00
parent 31da72545e
commit 6e56db8ce2
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_image.py
View File

@ -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

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -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

5
source/blender/editors/sculpt_paint/paint_image.c
View File

@ -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);
}