Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2018-01-30 23:31:32 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-01-30 23:31:38 +0300
commit133afc07b2555574c804f4932bc34903d15f3535 (patch)
tree60b04a21507c01cf6f18ccb5d20c1f34cc0e4d1e /source/blender/blenkernel/intern/node.c
parent7b675e0dc411d4f27c7ffca25782ac81eaf7e4c8 (diff)
Compositor / Render Layer Node: Fix wrong layer after deleting view layers
I was calling the ntree syncing function too late. So the index of the layer was -1 since it was no longer in the ListBase, making all RenderLayer nodes to decrease their respective `custom1` (even going to negative sometimes).
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r--source/blender/blenkernel/intern/node.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index cac2aab26dd..a5c3e6e4a43 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3819,6 +3819,7 @@ bool BKE_node_tree_iter_step(struct NodeTreeIterStore *ntreeiter,
void BKE_nodetree_remove_layer_n(bNodeTree *ntree, Scene *scene, const int layer_index)
{
+ BLI_assert(layer_index != -1);
for (bNode *node = ntree->nodes.first; node; node = node->next) {
if (node->type == CMP_NODE_R_LAYERS && (Scene *)node->id == scene) {
if (node->custom1 == layer_index) {