Skip to content
Snippets Groups Projects
Commit dc1b2653 authored by Campbell Barton's avatar Campbell Barton
Browse files

Holding down shift now keeps the group rather then expanding it.

parent 31a59ab1
Branches
Tags
No related merge requests found
...@@ -21,7 +21,7 @@ bl_info = { ...@@ -21,7 +21,7 @@ bl_info = {
"description": "Useful and time-saving tools for rendering workflow", "description": "Useful and time-saving tools for rendering workflow",
"author": "Campbell Barton", "author": "Campbell Barton",
"version": (1, 1), "version": (1, 1),
"blender": (2, 6, 9), "blender": (2, 69),
"location": "Node > Add Template", "location": "Node > Add Template",
"description": "Adds node presets", "description": "Adds node presets",
"warning": "", "warning": "",
...@@ -51,7 +51,7 @@ def node_center(context): ...@@ -51,7 +51,7 @@ def node_center(context):
return loc return loc
def node_template_add(context, filepath, node_group, report): def node_template_add(context, filepath, node_group, ungroup, report):
""" Main function """ Main function
""" """
...@@ -95,10 +95,11 @@ def node_template_add(context, filepath, node_group, report): ...@@ -95,10 +95,11 @@ def node_template_add(context, filepath, node_group, report):
if is_fail: if is_fail:
node_tree.nodes.remove(node) node_tree.nodes.remove(node)
else: else:
bpy.ops.node.group_ungroup() if ungroup:
bpy.ops.node.group_ungroup()
node_group.user_clear() #node_group.user_clear()
bpy.data.node_groups.remove(node_group) #bpy.data.node_groups.remove(node_group)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
...@@ -138,10 +139,14 @@ class NODE_OT_template_add(Operator): ...@@ -138,10 +139,14 @@ class NODE_OT_template_add(Operator):
) )
def execute(self, context): def execute(self, context):
node_template_add(context, self.filepath, self.group_name, self.report) node_template_add(context, self.filepath, self.group_name, True, self.report)
return {'FINISHED'} return {'FINISHED'}
def invoke(self, context, event):
node_template_add(context, self.filepath, self.group_name, not event.shift, self.report)
return {'FINISHED'}
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# node menu list # node menu list
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment