blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix T81589: Correct drag type handling in outliner 

Blender crashed when dragging and dropping color into the outliner.
This issue was cause by a missing check for the correct drag type
in `datastack_drop_poll`. The check is added in this commit.
Additionally, a new drag type is introduced for the "data stack"
drag option, that was introduced in commit 1572da858d, to
differentiate it from the existing WM_DRAG_ID type.

Reviewed By: Severin

Differential Revision: https://developer.blender.org/D9169
This commit is contained in:
Robert Guetzkow 2020-10-12 23:55:40 +02:00
parent dc71ad0624
commit 8427e02abc
Notes: blender-bot 2023-02-14 11:28:43 +01:00 
Referenced by issue #81589, Crash on Drag Collection color over to Collections
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/space_outliner/outliner_dragdrop.c
View File

@ -847,6 +847,10 @@ static bool datastack_drop_poll(bContext *C,
const wmEvent *event,
const char **r_tooltip)
{
if (drag->type != WM_DRAG_DATASTACK) {
return false;
}
SpaceOutliner *space_outliner = CTX_wm_space_outliner(C);
ARegion *region = CTX_wm_region(C);
bool changed = outliner_flag_set(&space_outliner->tree, TSE_HIGHLIGHTED | TSE_DRAG_ANY, false);
@ -1363,16 +1367,18 @@ static int outliner_item_drag_drop_invoke(bContext *C,
WM_operator_properties_free(&op_ptr);
}
wmDrag *drag = WM_event_start_drag(C, data.icon, WM_DRAG_ID, NULL, 0.0, WM_DRAG_NOP);
const bool use_datastack_drag = ELEM(tselem->type,
TSE_MODIFIER,
TSE_MODIFIER_BASE,
TSE_CONSTRAINT,
TSE_CONSTRAINT_BASE,
TSE_GPENCIL_EFFECT,
TSE_GPENCIL_EFFECT_BASE);
if (ELEM(tselem->type,
TSE_MODIFIER,
TSE_MODIFIER_BASE,
TSE_CONSTRAINT,
TSE_CONSTRAINT_BASE,
TSE_GPENCIL_EFFECT,
TSE_GPENCIL_EFFECT_BASE)) {
const int wm_drag_type = use_datastack_drag ? WM_DRAG_DATASTACK : WM_DRAG_ID;
wmDrag *drag = WM_event_start_drag(C, data.icon, wm_drag_type, NULL, 0.0, WM_DRAG_NOP);
if (use_datastack_drag) {
TreeElement *te_bone = NULL;
bPoseChannel *pchan = outliner_find_parent_bone(te, &te_bone);
datastack_drop_data_init(drag, (Object *)tselem->id, pchan, te, tselem, te->directdata);

1
source/blender/windowmanager/WM_types.h
View File

@ -822,6 +822,7 @@ typedef void (*wmPaintCursorDraw)(struct bContext *C, int, int, void *customdata
#define WM_DRAG_NAME 3
#define WM_DRAG_VALUE 4
#define WM_DRAG_COLOR 5
#define WM_DRAG_DATASTACK 6
typedef enum wmDragFlags {
WM_DRAG_NOP = 0,