diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 9 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_2d.c | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index e050c8fcdec..63b167282ce 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1049,7 +1049,7 @@ class TEXTURE_UL_texpaintslots(UIList): class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel): bl_context = "imagepaint" bl_label = "Slots" - bl_category = "Layers" + bl_category = "Slots" @classmethod def poll(cls, context): @@ -1092,7 +1092,7 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel): class VIEW3D_PT_stencil_projectpaint(View3DPanel, Panel): bl_context = "imagepaint" bl_label = "Stencil" - bl_category = "Layers" + bl_category = "Slots" @classmethod def poll(cls, context): diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index a26c8dbe81d..b3f13ccdb35 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6435,10 +6435,13 @@ bool UI_but_active_drop_name(bContext *C) bool UI_but_active_drop_color(bContext *C) { ARegion *ar = CTX_wm_region(C); - uiBut *but = ui_but_find_activated(ar); - if (but && but->type == COLOR) - return true; + if (ar) { + uiBut *but = ui_but_find_activated(ar); + + if (but && but->type == COLOR) + return true; + } return false; } diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index d394d6d3f63..affe69b719d 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -1392,7 +1392,7 @@ void paint_2d_bucket_fill( ED_imapaint_dirty_region(ima, ibuf, 0, 0, ibuf->x, ibuf->y); if (do_float) { - for (; x_px < ibuf->x; x_px++) { + for (x_px = 0; x_px < ibuf->x; x_px++) { for (y_px = 0; y_px < ibuf->y; y_px++) { blend_color_mix_float(ibuf->rect_float + 4 * (y_px * ibuf->x + x_px), ibuf->rect_float + 4 * (y_px * ibuf->x + x_px), color_f); @@ -1400,7 +1400,7 @@ void paint_2d_bucket_fill( } } else { - for (; x_px < ibuf->x; x_px++) { + for (x_px = 0; x_px < ibuf->x; x_px++) { for (y_px = 0; y_px < ibuf->y; y_px++) { blend_color_mix_byte((unsigned char *)(ibuf->rect + y_px * ibuf->x + x_px), (unsigned char *)(ibuf->rect + y_px * ibuf->x + x_px), (unsigned char *)&color_b); |