diff options
| author | Dan Eicher <dan@eu.phorio.us> | 2012-05-29 22:12:13 +0400 |
|---|---|---|
| committer | Dan Eicher <dan@eu.phorio.us> | 2012-05-29 22:12:13 +0400 |
| commit | 52aad984b6634f009ebc9fecf33bca786036a834 (patch) | |
| tree | 0ffa9681ee3b268620578dde2710bc507d399681 /source/blender/editors/include | |
| parent | 2aa3b5a24eaaeaeef671eb8f778d6fdaf21ea28d (diff) | |
Outliner Drag & Drop fixes
OUTLINER_OT_parent_drop
* use scene of child instead of active scene
* poll to check if parent and child are in same scene
OUTLINER_OT_parent_clear
* get scene from child instead of only working on active scene
* poll to check if no parent
OUTLINER_OT_scene_drop && OBJECT_OT_make_links_scene
* memory leak on error
* would only link some objects on error
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index dc7bfd6aff2..3036e73c811 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -85,8 +85,8 @@ extern struct EnumPropertyItem prop_clear_parent_types[]; extern struct EnumPropertyItem prop_make_parent_types[]; 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); -struct Base *ED_object_scene_link(struct ReportList *reports, struct Scene *scene, struct Object *ob); +void ED_object_parent_clear(struct Object *ob, int type); +struct Base *ED_object_scene_link(struct Scene *scene, struct Object *ob); /* generic editmode keys like pet * do_pet |