[Bf-blender-cvs] [e9dd97405e5] blender2.8: Layers util function to move objects around

[Dalai Felinto]

Commit: e9dd97405e545afe83f489ea5edb42ff61160198
Author: Dalai Felinto
Date:   Fri Mar 10 18:12:47 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBe9dd97405e545afe83f489ea5edb42ff61160198

Layers util function to move objects around

This is required for outliner, so we can move an object from a collection into another

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

M	source/blender/blenkernel/BKE_collection.h
M	source/blender/blenkernel/intern/collection.c

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

diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 2ea2c23dadd..b4817f4d351 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -51,6 +51,7 @@ void BKE_collection_object_add(struct Scene *scene, struct SceneCollection *sc,
 void BKE_collection_object_add_from(struct Scene *scene, struct Object *ob_src, struct Object *ob_dst);
 void BKE_collection_object_remove(struct Main *bmain, struct Scene *scene, struct SceneCollection *sc, struct Object *object, const bool free_us);
 void BKE_collections_object_remove(struct Main *bmain, struct Scene *scene, struct Object *object, const bool free_us);
+void BKE_collection_object_move(struct Main *bmain, struct Scene *scene, struct SceneCollection *sc_dst, struct SceneCollection *sc_src, struct Object *ob);
 
 void BKE_collection_reinsert_after(const struct Scene *scene, struct SceneCollection *sc_reinsert, struct SceneCollection *sc_after);
 void BKE_collection_reinsert_into(struct SceneCollection *sc_reinsert, struct SceneCollection *sc_into);
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 564fa5d9593..614ba0b59c6 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -285,6 +285,15 @@ void BKE_collection_object_remove(Main *bmain, Scene *scene, SceneCollection *sc
 }
 
 /**
+ * Move object from a collection into another
+ */
+void BKE_collection_object_move(Main *bmain, Scene *scene, SceneCollection *sc_dst, SceneCollection *sc_src, Object *ob)
+{
+	BKE_collection_object_add(scene, sc_dst, ob);
+	BKE_collection_object_remove(bmain, scene, sc_src, ob, false);
+}
+
+/**
  * Remove object from all collections of scene
  */
 void BKE_collections_object_remove(Main *bmain, Scene *scene, Object *ob, const bool free_us)