[Bf-blender-cvs] [c4a4ba004a2] soc-2019-outliner: Outliner: Improvements to outliner parenting

[Nathan Craddock]

Commit: c4a4ba004a26fbd377ac23e5fa38257616714f1c
Author: Nathan Craddock
Date:   Tue Jul 30 17:35:27 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBc4a4ba004a26fbd377ac23e5fa38257616714f1c

Outliner: Improvements to outliner parenting

Cleaned up the code for parenting to armatures, lattices, and
curves. The only downside of this method is the operator reports
will not function from the menu.

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

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 6bd47da7be2..b58a0f34703 100644
--- a/source/blender/editors/space_outliner/outliner_dragdrop.c
+++ b/source/blender/editors/space_outliner/outliner_dragdrop.c
@@ -327,7 +327,7 @@ static bool parent_drop_poll(bContext *C,
 }
 
 static void parent_drop_set_parents(
-    bContext *C, wmOperator *op, wmDragID *drag, Object *parent, short 
parent_type)
+    bContext *C, ReportList *reports, wmDragID *drag, Object *parent, short 
parent_type)
 {
   Main *bmain = CTX_data_main(C);
   SpaceOutliner *soops = CTX_wm_space_outliner(C);
@@ -351,12 +351,12 @@ static void parent_drop_set_parents(
 
       /* Do nothing to linked data */
       if (ID_IS_LINKED(object)) {
-        puts("Can't edit library linked object");
-        // BKE_report(op->reports, RPT_INFO, "Can't edit library linked 
object");
+        BKE_report(reports, RPT_INFO, "Can't edit library linked object");
         continue;
       }
 
-      if (ED_object_parent_set(NULL, C, scene, object, parent, parent_type, 
false, false, NULL)) {
+      if (ED_object_parent_set(
+              reports, C, scene, object, parent, parent_type, false, false, 
NULL)) {
         parent_set = true;
       }
     }
@@ -370,7 +370,6 @@ static void parent_drop_set_parents(
 }
 
 typedef struct ParentDropData {
-  wmOperator *op;
   Object *parent;
   ListBase *drag_items;
   short type;
@@ -381,7 +380,7 @@ static void parent_drop_menu_callback(bContext *C, void 
*data, int event)
   ParentDropData *drag_data = (ParentDropData *)data;
 
   wmDragID *drag = drag_data->drag_items->first;
-  parent_drop_set_parents(C, drag_data->op, drag, drag_data->parent, event);
+  parent_drop_set_parents(C, NULL, drag, drag_data->parent, event);
 
   BLI_freelistN(drag_data->drag_items);
   MEM_freeN(drag_data->drag_items);
@@ -592,10 +591,6 @@ static int parent_drop_invoke(bContext *C, wmOperator *op, 
const wmEvent *event)
   if (ob == par) {
     return OPERATOR_CANCELLED;
   }
-  if (ID_IS_LINKED(ob)) {
-    BKE_report(op->reports, RPT_INFO, "Can't edit library linked object");
-    return OPERATOR_CANCELLED;
-  }
 
   if (event->custom != EVT_DATA_DRAGDROP) {
     return OPERATOR_CANCELLED;
@@ -605,11 +600,10 @@ static int parent_drop_invoke(bContext *C, wmOperator 
*op, const wmEvent *event)
   wmDrag *drag = lb->first;
 
   if (par->type != OB_ARMATURE && par->type != OB_CURVE && par->type != 
OB_LATTICE) {
-    parent_drop_set_parents(C, op, drag->ids.first, par, PAR_OBJECT);
+    parent_drop_set_parents(C, op->reports, drag->ids.first, par, PAR_OBJECT);
   }
   else {
     ParentDropData *data = MEM_callocN(sizeof(ParentDropData), 
"parent_drop_data");
-    data->op = op;
     data->parent = par;
     data->type = par->type;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs