[Bf-blender-cvs] [bc23210] render-layers: Shuffle code around to re-order functions

Dalai Felinto noreply at git.blender.org
Sat Dec 3 02:44:22 CET 2016


Commit: bc2321025beec65c26a661908a9049fee1d80454
Author: Dalai Felinto
Date:   Sat Dec 3 01:21:08 2016 +0100
Branches: render-layers
https://developer.blender.org/rBbc2321025beec65c26a661908a9049fee1d80454

Shuffle code around to re-order functions

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

M	source/blender/blenkernel/BKE_layer.h
M	source/blender/blenkernel/intern/layer.c

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

diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index b4060c4..d67304e 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -47,10 +47,10 @@ bool BKE_scene_layer_remove(struct Main *bmain, struct Scene *scene, struct Scen
 
 void BKE_scene_layer_engine_set(struct SceneLayer *sl, const char *engine);
 
-struct LayerCollection *BKE_collection_link(struct SceneLayer *sl, struct SceneCollection *sc);
-
 void BKE_layer_collection_free(struct SceneLayer *sl, struct LayerCollection *lc);
 
+struct LayerCollection *BKE_collection_link(struct SceneLayer *sl, struct SceneCollection *sc);
+
 void BKE_collection_unlink(struct SceneLayer *sl, struct LayerCollection *lc);
 
 void BKE_collection_override_datablock_add(struct LayerCollection *lc, const char *data_path, struct ID *id);
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index a27eac4..5022f4e 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -141,18 +141,7 @@ static ObjectBase *object_base_add(SceneLayer *sl, Object *ob)
 	return base;
 }
 
-/* CollectionBase */
-
-/*
- * Link a collection to a renderlayer
- * The collection needs to be created separately
- */
-LayerCollection *BKE_collection_link(SceneLayer *sl, SceneCollection *sc)
-{
-	LayerCollection *lc = layer_collection_add(sl, &sl->collections, sc);
-	return lc;
-}
-
+/* LayerCollection */
 /*
  * Free LayerCollection from SceneLayer
  */
@@ -169,6 +158,16 @@ void BKE_layer_collection_free(SceneLayer *sl, LayerCollection *lc)
 }
 
 /*
+ * Link a collection to a renderlayer
+ * The collection needs to be created separately
+ */
+LayerCollection *BKE_collection_link(SceneLayer *sl, SceneCollection *sc)
+{
+	LayerCollection *lc = layer_collection_add(sl, &sl->collections, sc);
+	return lc;
+}
+
+/*
  * Unlink a collection base from a renderlayer
  * The corresponding collection is not removed from the master collection
  */




More information about the Bf-blender-cvs mailing list