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:
authorLukas Toenne <lukas.toenne@googlemail.com>2013-05-16 19:06:18 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2013-05-16 19:06:18 +0400
commita8964d865f387dc04b2e4c34c91269ac22edb98b (patch)
tree51bd2391f76f0b554d28d888adebfc04083a5a51 /source/blender/makesdna/DNA_node_types.h
parentb881dd9e7f92b0198c965bb5b70dbf5f5844a865 (diff)
Fix #35388, grouped nodes not editable in properties ui.
The issue here was that the "active" material node depends on the editor context. Previously (< 2.67) there was only 1 edited node group possible globally throughout Blender, so the active material in the context could be resolved more easily. The solution now involves the active_viewer_key variable (first introduced for compositor viewer nodes in r56271, naming is a bit awkward but hard to change in DNA). This key defines the "last modified" node tree to resolve ambiguity of active context items. For single editors the result is the same as in 2.66, if multiple editors are used with different node groups the last modified tree is used.
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
-rw-r--r--source/blender/makesdna/DNA_node_types.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 3ed97c2480f..25412f1937b 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -370,10 +370,8 @@ typedef struct bNodeTree {
* Only available in base node trees (e.g. scene->node_tree)
*/
struct bNodeInstanceHash *previews;
- /* XXX workaround for ambiguous viewer output:
- * Viewer nodes all write to the same image buffer.
- * This determines the tree instance containing the "active" output.
- * Only used in local scene->nodetree.
+ /* Defines the node tree instance to use for the "active" context,
+ * in case multiple different editors are used and make context ambiguous.
*/
bNodeInstanceKey active_viewer_key;
int pad;