diff options
author | Jacques Lucke <jacques@blender.org> | 2020-10-02 16:14:08 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-10-02 16:14:20 +0300 |
commit | 66cd82a8d23be2e78a3536706c1b66e3cbf8476f (patch) | |
tree | db720887598d0e7f3c46a083120d98eb51a982cf /source/blender/modifiers | |
parent | 74ea36983038da1a2f00b35feed81032fcd666eb (diff) |
Volumes: make Mesh to Volume modifier independent of object transforms
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_mesh_to_volume.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc index 6fdc78c6ce9..2d6791cbe68 100644 --- a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc +++ b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc @@ -120,7 +120,6 @@ static void initData(ModifierData *md) static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx) { MeshToVolumeModifierData *mvmd = reinterpret_cast<MeshToVolumeModifierData *>(md); - DEG_add_modifier_to_transform_relation(ctx->node, "Mesh to Volume Modifier"); if (mvmd->object) { DEG_add_object_relation( ctx->node, mvmd->object, DEG_OB_COMP_GEOMETRY, "Mesh to Volume Modifier"); @@ -198,7 +197,9 @@ static float compute_voxel_size(const MeshToVolumeModifierData *mvmd, return voxel_size; } -static Volume *modifyVolume(ModifierData *md, const ModifierEvalContext *ctx, Volume *input_volume) +static Volume *modifyVolume(ModifierData *md, + const ModifierEvalContext *UNUSED(ctx), + Volume *input_volume) { #ifdef WITH_OPENVDB using namespace blender; @@ -215,8 +216,7 @@ static Volume *modifyVolume(ModifierData *md, const ModifierEvalContext *ctx, Vo } BKE_mesh_wrapper_ensure_mdata(mesh); - const float4x4 mesh_to_own_object_space_transform = float4x4(ctx->object->imat) * - float4x4(object_to_convert->obmat); + const float4x4 mesh_to_own_object_space_transform = object_to_convert->obmat; const float voxel_size = compute_voxel_size(mvmd, mesh_to_own_object_space_transform); float4x4 mesh_to_index_space_transform; @@ -263,7 +263,7 @@ static Volume *modifyVolume(ModifierData *md, const ModifierEvalContext *ctx, Vo return volume; #else - UNUSED_VARS(md, ctx); + UNUSED_VARS(md); UNUSED_VARS(compute_voxel_size); BKE_modifier_set_error(md, "Compiled without OpenVDB"); return input_volume; |