kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fixes:

Browse Source 
* Crash with image drag'n'drop
* Drag'n drop color to paint 2d canvas not working
* Change "Layers" to "Slots" to appease purists.
This commit is contained in:
Antony Riakiotakis 2014-07-24 15:18:49 +02:00
parent b7b1c09766
commit 36b6b69173
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View 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):

9
source/blender/editors/interface/interface_handlers.c
View 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;
}

4
source/blender/editors/sculpt_paint/paint_image_2d.c
View 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);