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:
authorAngus Stanton <abstanton>2022-04-18 18:15:30 +0300
committerHans Goudey <h.goudey@me.com>2022-04-18 18:15:30 +0300
commitccd2e89d37fb4887045969c1a50a66ca024c8c11 (patch)
tree7de971316373c59c2ade1599abedc592ea91a6a1 /release
parentef2b8c1c3afac9176da936995231523745e21643 (diff)
Fix T94559: Copying geometry node group does not copy animation data
Reimplement copy geometry node groups in C. The version implemented in Python could also manually copy the animation data, but it's more standard to do this with `BKE_id_copy_ex` and `LIB_ID_COPY_ACTIONS`. Differential Revision: https://developer.blender.org/D14615
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_operators/geometry_nodes.py25
-rw-r--r--release/scripts/startup/bl_ui/space_node.py2
2 files changed, 1 insertions, 26 deletions
diff --git a/release/scripts/startup/bl_operators/geometry_nodes.py b/release/scripts/startup/bl_operators/geometry_nodes.py
index f62fed79438..f435efc76fc 100644
--- a/release/scripts/startup/bl_operators/geometry_nodes.py
+++ b/release/scripts/startup/bl_operators/geometry_nodes.py
@@ -83,32 +83,7 @@ class NewGeometryNodeTreeAssign(Operator):
return {'FINISHED'}
-class CopyGeometryNodeTreeAssign(Operator):
- """Copy the active geometry node group and assign it to the active modifier"""
-
- bl_idname = "node.copy_geometry_node_group_assign"
- bl_label = "Copy Geometry Node Group"
- bl_options = {'REGISTER', 'UNDO'}
-
- @classmethod
- def poll(cls, context):
- return geometry_modifier_poll(context)
-
- def execute(self, context):
- modifier = context.object.modifiers.active
- if modifier is None:
- return {'CANCELLED'}
-
- group = modifier.node_group
- if group is None:
- return {'CANCELLED'}
-
- modifier.node_group = group.copy()
- return {'FINISHED'}
-
-
classes = (
NewGeometryNodesModifier,
NewGeometryNodeTreeAssign,
- CopyGeometryNodeTreeAssign,
)
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 1a6e9f57e75..d7c6bf63423 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -149,7 +149,7 @@ class NODE_HT_header(Header):
active_modifier = ob.modifiers.active
if active_modifier and active_modifier.type == 'NODES':
if active_modifier.node_group:
- row.template_ID(active_modifier, "node_group", new="node.copy_geometry_node_group_assign")
+ row.template_ID(active_modifier, "node_group", new="object.geometry_node_tree_copy_assign")
else:
row.template_ID(active_modifier, "node_group", new="node.new_geometry_node_group_assign")
else: