Fixes:

* Crash with image drag'n'drop
* Drag'n drop color to paint 2d canvas not working
* Change "Layers" to "Slots" to appease purists.

2 files changed, 8 insertions, 5 deletions

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