[Bf-blender-cvs] [70a6c737ec7] master: Cleanup: Deduplicate getting node tree from id
Jacques Lucke
noreply at git.blender.org
Thu Apr 16 12:08:02 CEST 2020
Commit: 70a6c737ec7eec3402418fef10af0db3b417b42a
Author: Jacques Lucke
Date: Thu Apr 16 12:06:01 2020 +0200
Branches: master
https://developer.blender.org/rB70a6c737ec7eec3402418fef10af0db3b417b42a
Cleanup: Deduplicate getting node tree from id
Differential Revision: https://developer.blender.org/D7438
Reviewers: mont29
===================================================================
M source/blender/editors/space_node/node_draw.c
===================================================================
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 0552660b9bf..bdb7f787be6 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -94,23 +94,11 @@ void ED_node_tree_update(const bContext *C)
static bNodeTree *node_tree_from_ID(ID *id)
{
if (id) {
- short idtype = GS(id->name);
-
- switch (idtype) {
- case ID_NT:
- return (bNodeTree *)id;
- case ID_MA:
- return ((Material *)id)->nodetree;
- case ID_LA:
- return ((Light *)id)->nodetree;
- case ID_WO:
- return ((World *)id)->nodetree;
- case ID_SCE:
- return ((Scene *)id)->nodetree;
- case ID_TE:
- return ((Tex *)id)->nodetree;
- case ID_LS:
- return ((FreestyleLineStyle *)id)->nodetree;
+ if (GS(id->name) == ID_NT) {
+ return (bNodeTree *)id;
+ }
+ else {
+ return ntreeFromID(id);
}
}
More information about the Bf-blender-cvs
mailing list