diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-10-19 23:01:41 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-10-19 23:04:14 +0300 |
| commit | fc10484f7c55d425f8374f2ea64f6b525cff2b7d (patch) | |
| tree | 0e9a08aaa918f95bb8814ce316ac1e24fd65ea9d /source/blender/blenkernel/BKE_object.h | |
| parent | 4d2416b99c472c9735e074d864dcf82a85da8c58 (diff) | |
Fix/properly implement: "make group proxy"
This was never correctly implemented. It now works as expected (ala 2.79 behaviour).
The proxy object is added to all the collections of the original empty.
Before not only this wasn't the case, but it would crash Blender.
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_object.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index ce6a95c682b..5dcd22190ac 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -91,9 +91,13 @@ struct Object *BKE_object_add_only_object( int type, const char *name) ATTR_NONNULL(1) ATTR_RETURNS_NONNULL; struct Object *BKE_object_add( - struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, + struct Main *bmain, struct Scene *scene, struct SceneLayer *scene_layer, int type, const char *name) ATTR_NONNULL(1, 2, 3) ATTR_RETURNS_NONNULL; +struct Object *BKE_object_add_from( + struct Main *bmain, struct Scene *scene, struct SceneLayer *scene_layer, + int type, const char *name, struct Object *ob_src) + ATTR_NONNULL(1, 2, 3, 6) ATTR_RETURNS_NONNULL; void *BKE_object_obdata_add_from_type( struct Main *bmain, int type, const char *name) |