[Bf-blender-cvs] [e15ef1d] layers: BKE_scene_ layer/collection API touch ups

Dalai Felinto noreply at git.blender.org
Tue Nov 22 17:30:18 CET 2016


Commit: e15ef1dbe162aa3cd938b6d303b3327bf3b98378
Author: Dalai Felinto
Date:   Tue Nov 22 15:20:56 2016 +0100
Branches: layers
https://developer.blender.org/rBe15ef1dbe162aa3cd938b6d303b3327bf3b98378

BKE_scene_ layer/collection API touch ups

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

M	source/blender/blenkernel/BKE_scene.h
M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 23eadf6..5abc9e0 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -129,7 +129,7 @@ void BKE_scene_update_for_newframe_ex(struct EvaluationContext *eval_ctx, struct
 struct SceneLayer *BKE_scene_add_layer(struct Scene *sce, const char *name);
 bool BKE_scene_remove_layer(struct Main *main, struct Scene *scene, struct SceneLayer *sl);
 struct LayerCollection *BKE_scene_add_collection(struct SceneLayer *sl, const char *name);
-bool BKE_scene_remove_collection(struct Main *main, struct SceneLayer *sl, struct LayerCollection *lc);
+bool BKE_scene_remove_collection(struct SceneLayer *sl, struct LayerCollection *lc);
 
 struct SceneRenderLayer *BKE_scene_add_render_layer(struct Scene *sce, const char *name);
 bool BKE_scene_remove_render_layer(struct Main *main, struct Scene *scene, struct SceneRenderLayer *srl);
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 8a02d4e..bdea85e 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2047,7 +2047,7 @@ LayerCollection *BKE_scene_add_collection(SceneLayer *sl, const char *name)
 }
 
 
-bool BKE_scene_remove_collection(Main *bmain, SceneLayer *sl, LayerCollection *lc)
+bool BKE_scene_remove_collection(SceneLayer *sl, LayerCollection *lc)
 {
 	const int act = BLI_findindex(&sl->collections, lc);
 	if (act == -1) {
@@ -2118,6 +2118,20 @@ bool BKE_scene_remove_layer(Main *bmain, Scene *scene, SceneLayer *sl)
 	/* TODO only change active_layer if necessary */
 	scene->active_layer = 0;
 
+	for (Scene *sce = bmain->scene.first; sce; sce = sce->id.next) {
+		if (sce->nodetree) {
+			bNode *node;
+			for (node = sce->nodetree->nodes.first; node; node = node->next) {
+				if (node->type == CMP_NODE_R_LAYERS && (Scene *)node->id == scene) {
+					if (node->custom1 == act)
+						node->custom1 = 0;
+					else if (node->custom1 > act)
+						node->custom1--;
+				}
+			}
+		}
+	}
+
 	return true;
 }




More information about the Bf-blender-cvs mailing list