diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-08-12 14:41:26 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-08-12 14:44:47 +0400 |
| commit | 1743c81ce1b01e89728f98ea66ba1c07192bcff9 (patch) | |
| tree | 6798293f18ad84919a4c73c10f23edd7e9b8e8ec /source/blender/nodes/texture | |
| parent | 2b1bacddec586ce5f92278310b813c3c4d2359c2 (diff) | |
Fix T41349: Muting texture nodes can cause crashes.
Problem is that setup of stack indices which refer to the same stack
entry can lead to cyclic TexDelegate node pointers, causing an infinite
loop.
Fixing this would take too much time and require recoding large parts of
the texnodes system, which is earmarked for scrapping anyway ... So for
now just disabled muting in texnodes to avoid crashes.
Diffstat (limited to 'source/blender/nodes/texture')
| -rw-r--r-- | source/blender/nodes/texture/node_texture_tree.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index c0c5787b765..02f15705ad1 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -137,6 +137,10 @@ static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCa func(calldata, NODE_CLASS_LAYOUT, N_("Layout")); } +/* XXX muting disabled in previews because of threading issues with the main execution + * it works here, but disabled for consistency + */ +#if 0 static void localize(bNodeTree *localtree, bNodeTree *UNUSED(ntree)) { bNode *node, *node_next; @@ -151,6 +155,11 @@ static void localize(bNodeTree *localtree, bNodeTree *UNUSED(ntree)) } } } +#else +static void localize(bNodeTree *UNUSED(localtree), bNodeTree *UNUSED(ntree)) +{ +} +#endif static void local_sync(bNodeTree *localtree, bNodeTree *ntree) { |