[Bf-blender-cvs] [bc6bdf5b79f] soc-2020-outliner: Cleanup

[Nathan Craddock]

Commit: bc6bdf5b79fcb546579b2439c9ee8901042ec6ae
Author: Nathan Craddock
Date:   Sat Jul 25 12:00:18 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rBbc6bdf5b79fcb546579b2439c9ee8901042ec6ae

Cleanup

===================================================================

M	source/blender/editors/space_outliner/outliner_dragdrop.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.c b/source/blender/editors/space_outliner/outliner_dragdrop.c
index 4c50b05dd66..43d108490a6 100644
--- a/source/blender/editors/space_outliner/outliner_dragdrop.c
+++ b/source/blender/editors/space_outliner/outliner_dragdrop.c
@@ -833,20 +833,19 @@ static bool uistack_drop_poll(bContext *C,
     ob = NULL;
   }
 
-  /* Drag a base. */
+  /* Drag a base for linking. */
   if (ELEM(
           drop_data->drag_tselem->type, TSE_MODIFIER_BASE, TSE_CONSTRAINT_BASE, TSE_EFFECT_BASE)) {
+    drop_data->insert_type = TE_INSERT_INTO;
+    drop_data->drop_action = UI_STACK_DROP_LINK;
+
     if (pchan && pchan != drop_data->bone_parent) {
       *r_tooltip = TIP_("Link all to bone");
-      drop_data->insert_type = TE_INSERT_INTO;
-      drop_data->drop_action = UI_STACK_DROP_LINK;
       drop_data->drop_te = bone_te;
       tselem_target = TREESTORE(bone_te);
     }
     else if (ob && ob != drop_data->ob_parent) {
       *r_tooltip = TIP_("Link all to object");
-      drop_data->insert_type = TE_INSERT_INTO;
-      drop_data->drop_action = UI_STACK_DROP_LINK;
       drop_data->drop_te = object_te;
       tselem_target = TREESTORE(object_te);
     }