[Bf-blender-cvs] [32662bc95d] render-layers: Using static for prototypes
Dalai Felinto
noreply at git.blender.org
Thu Jan 19 18:28:18 CET 2017
Commit: 32662bc95de593afa783adbd270ba08b01c87aae
Author: Dalai Felinto
Date: Thu Jan 19 12:06:18 2017 +0100
Branches: render-layers
https://developer.blender.org/rB32662bc95de593afa783adbd270ba08b01c87aae
Using static for prototypes
===================================================================
M source/blender/blenkernel/intern/layer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index faa662aa44..d93d7526c6 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -44,9 +44,9 @@
#include "MEM_guardedalloc.h"
/* prototype */
-void layer_collection_free(SceneLayer *sl, LayerCollection *lc);
-LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, SceneCollection *sc);
-LayerCollection *find_layer_collection_by_scene_collection(LayerCollection *lc, const SceneCollection *sc);
+static void layer_collection_free(SceneLayer *sl, LayerCollection *lc);
+static LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, SceneCollection *sc);
+static LayerCollection *find_layer_collection_by_scene_collection(LayerCollection *lc, const SceneCollection *sc);
/* RenderLayer */
@@ -272,7 +272,7 @@ static ObjectBase *object_base_add(SceneLayer *sl, Object *ob)
* When freeing the entire SceneLayer at once we don't bother with unref
* otherwise SceneLayer is passed to keep the syncing of the LayerCollection tree
*/
-void layer_collection_free(SceneLayer *sl, LayerCollection *lc)
+static void layer_collection_free(SceneLayer *sl, LayerCollection *lc)
{
if (sl) {
for (LinkData *link = lc->object_bases.first; link; link = link->next) {
@@ -448,7 +448,7 @@ static void layer_collection_populate(SceneLayer *sl, LayerCollection *lc, Scene
}
}
-LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, SceneCollection *sc)
+static LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, SceneCollection *sc)
{
LayerCollection *lc = MEM_callocN(sizeof(LayerCollection), "Collection Base");
BLI_addtail(lb, lc);
@@ -494,7 +494,7 @@ bool BKE_scene_has_object(Scene *scene, Object *ob)
/* ---------------------------------------------------------------------- */
/* Syncing */
-LayerCollection *find_layer_collection_by_scene_collection(LayerCollection *lc, const SceneCollection *sc)
+static LayerCollection *find_layer_collection_by_scene_collection(LayerCollection *lc, const SceneCollection *sc)
{
if (lc->scene_collection == sc) {
return lc;
More information about the Bf-blender-cvs
mailing list