diff options
author | Willian Padovani Germano <wpgermano@gmail.com> | 2008-02-10 06:40:24 +0300 |
---|---|---|
committer | Willian Padovani Germano <wpgermano@gmail.com> | 2008-02-10 06:40:24 +0300 |
commit | f46fcf7aab30fa2c905840e4ad0d4f1486994285 (patch) | |
tree | 0bce96c6bc3c9faa1814d561f4bc738cdebb23de /source/blender/nodes | |
parent | 34ddfb03c1f2f77d09d02793e368cca5abf95e9c (diff) |
== PyNodes ==
1) Including the Add->Dynamic submenu in the Nodes window header. Previously pynodes could only be added via toolbox.
2) Disabling pynodes execution when using more than one thread for rendering. This prevents the crashes while a proper fix isn't implemented.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c b/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c index c198e73a3bf..9c15877e478 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c @@ -570,6 +570,9 @@ static void node_dynamic_exec_cb(void *data, bNode *node, bNodeStack **in, bNode if (!node->id) return; + if (G.scene->r.threads > 1) + return; + if (BTST2(node->custom1, NODE_DYNAMIC_NEW, NODE_DYNAMIC_REPARSE)) { node_dynamic_setup(node); return; |