Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-02-22 11:56:15 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-02-22 11:56:15 +0400
commite5d4e0f69bab7ff7fd7df23a1790bba9c8adcf8d (patch)
tree6fdbfa516a784081091523b784c51d32e9ac631e /source/blender/editors/include/ED_object.h
parent9ca3084d4dc8efabc72e1970725c396b59f78cdf (diff)
Fix #30231: Drag and Droping Parenting from Outliner giving unnecessary Loop Error
In fact, error was much deeper and DND parenting in outliner used to parent all selected objects to drop target, not just currently dragging object. This was caused by code sharing between Parent Set operator and this DND operator which was iterating all selected objects in scene and was setting parent to it. Solved issue by separating actual parenting code which makes specified object be parented to specified parent and moved iterating to Parent Set exec callback. Now both of discovered issues (unneeded loop error and parenting all selected objects) are solved, but more extensive testing of this changes are welcome.
Diffstat (limited to 'source/blender/editors/include/ED_object.h')
-rw-r--r--source/blender/editors/include/ED_object.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 3e78a5649e5..85e68ba7ab4 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -84,7 +84,7 @@ typedef enum eParentType {
extern struct EnumPropertyItem prop_clear_parent_types[];
extern struct EnumPropertyItem prop_make_parent_types[];
-int ED_object_parent_set(struct bContext *C, struct wmOperator *op, struct Object *par, int partype);
+int ED_object_parent_set(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, struct Object *par, int partype);
void ED_object_parent_clear(struct bContext *C, int type);