diff options
author | Hans Goudey <h.goudey@me.com> | 2021-10-19 16:39:10 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-10-19 16:39:10 +0300 |
commit | 219058c213d5c9efce3f44216f6513edc93b5536 (patch) | |
tree | 26b76ae133b36d41c9a90d43eaa29ebf2b943c5a /source/blender/modifiers/intern | |
parent | cd36f59027042ff0f2ad53e98088428a4c0c5e38 (diff) |
Geometry Nodes: Remove implicit realizing and conversion
This commit removes the implicit conversion from points to a mesh
that used to happen before the next modifier. It also removes the
implicit realizing of instances that happened before another modifier.
Now we have specific nodes for both of these operations, the
implicit conversions make less sense, and implicit instance
realizing has already been removed in other nodes.
This adds another geometry nodes modifier before modifiers that would
have realized instances implicitly before. Currently adding another
data-block during versioning after linking means that an assert needs
to be changed. That should be made unnecessary by T92333.
Differential Revision: https://developer.blender.org/D12722
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r-- | source/blender/modifiers/intern/MOD_nodes.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index b28fead299d..b5ca5f3545f 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -1093,12 +1093,6 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * modifyGeometry(md, ctx, geometry_set); - if (ctx->flag & MOD_APPLY_TO_BASE_MESH) { - /* In this case it makes sense to realize instances, otherwise in some cases there might be no - * results when applying the modifier. */ - geometry_set = blender::bke::geometry_set_realize_mesh_for_modifier(geometry_set); - } - Mesh *new_mesh = geometry_set.get_component_for_write<MeshComponent>().release(); if (new_mesh == nullptr) { return BKE_mesh_new_nomain(0, 0, 0, 0, 0); |