Commit: e5c637f5fea31251f49980f0ef6eb19695a6cba2 Author: Dalai Felinto Date: Fri Nov 6 18:22:36 2020 +0100 Branches: geometry-nodes https://developer.blender.org/rBe5c637f5fea31251f49980f0ef6eb19695a6cba2
Merge remote-tracking branch 'origin/master' into geometry-nodes =================================================================== =================================================================== diff --cc source/blender/editors/space_node/node_group.c index 1e679d7d7c9,654b95858bb..f2abe272f48 --- a/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@@ -68,10 -73,11 +73,11 @@@ static bool node_group_operator_active_ * Disabled otherwise to allow pynodes define their own operators * with same keymap. */ - if (STREQ(snode->tree_idname, "ShaderNodeTree") || - STREQ(snode->tree_idname, "CompositorNodeTree") || - STREQ(snode->tree_idname, "TextureNodeTree") || - STREQ(snode->tree_idname, "GeometryNodeTree")) { + if (STR_ELEM(snode->tree_idname, + "ShaderNodeTree", + "CompositorNodeTree", + "TextureNodeTree", - "SimulationNodeTree")) { ++ "GeometryNodeTree")) { return true; } } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs