From 66cd82a8d23be2e78a3536706c1b66e3cbf8476f Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 2 Oct 2020 15:14:08 +0200 Subject: Volumes: make Mesh to Volume modifier independent of object transforms --- source/blender/modifiers/intern/MOD_mesh_to_volume.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source') 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(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; -- cgit v1.2.3