[Bf-blender-cvs] [f8ca71e66a1] soc-2019-outliner: Outliner: Always do object parenting

[Nathan Craddock]

Commit: f8ca71e66a11d5a8f250c43e6a6b5c00f83ab4fa
Author: Nathan Craddock
Date:   Sat Jul 13 16:08:52 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBf8ca71e66a11d5a8f250c43e6a6b5c00f83ab4fa

Outliner: Always do object parenting

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

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 132939a306e..11de977d50f 100644
--- a/source/blender/editors/space_outliner/outliner_dragdrop.c
+++ b/source/blender/editors/space_outliner/outliner_dragdrop.c
@@ -397,16 +397,17 @@ static int parent_drop_invoke(bContext *C, wmOperator *op, const wmEvent *event)
     scene = CTX_data_scene(C);
   }
 
-  if ((par->type != OB_ARMATURE) && (par->type != OB_CURVE) && (par->type != OB_LATTICE)) {
+  /* Temporary: Only do object parenting */
+  if (true) {
     if (event->custom != EVT_DATA_DRAGDROP) {
       return OPERATOR_CANCELLED;
     }
 
+    bool parent_set = false;
+    int partype = 0;
     ListBase *lb = event->customdata;
     wmDrag *drag = lb->first;
 
-    bool parent_set = false;
-    int partype = 0;
     for (wmDragID *drag_id = drag->ids.first; drag_id; drag_id = drag_id->next) {
       if (GS(drag_id->id->name) == ID_OB) {
         Object *object = (Object *)drag_id->id;