Fixes:
authorAntony Riakiotakis <kalast@gmail.com>
Thu, 24 Jul 2014 13:18:49 +0000 (15:18 +0200)
committerAntony Riakiotakis <kalast@gmail.com>
Thu, 24 Jul 2014 13:18:49 +0000 (15:18 +0200)
* Crash with image drag'n'drop
* Drag'n drop color to paint 2d canvas not working
* Change "Layers" to "Slots" to appease purists.

release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/interface/interface_handlers.c
source/blender/editors/sculpt_paint/paint_image_2d.c

index e050c8fcdecc0a7741a3add33eff4f805d001513..63b167282ce80cb61a99caa96cb0954de2ccf975 100644 (file)
@@ -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):
index a26c8dbe81d18515e0c16ab83acb5f58976fd7aa..b3f13ccdb35f85548e4c4ca1306519f6e0e8b0b0 100644 (file)
@@ -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;
 }
index d394d6d3f637d3ae1636c8dc89dc1fe0badf98c0..affe69b719dbb90874cc7d7cca9cf71b2ea03aed 100644 (file)
@@ -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);