Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
index 0065012db97..2a8883dc2eb 100644
--- a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
+++ b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
@@ -77,7 +77,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u
   walk(userData, ob, (ID **)&vmmd->object, IDWALK_CB_NOP);
 }
 
-static void panel_draw(const bContext *UNUSED(C), Panel *panel)
+static void panel_draw(const bContext * /*C*/, Panel *panel)
 {
   uiLayout *layout = panel->layout;
 
@@ -157,8 +157,8 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
                                                                                   volume_grid);
 
   openvdb::math::Transform::Ptr transform = local_grid->transform().copy();
-  transform->postMult(openvdb::Mat4d(((float *)vmmd->object->obmat)));
-  openvdb::Mat4d imat = openvdb::Mat4d((float *)ctx->object->imat);
+  transform->postMult(openvdb::Mat4d((float *)vmmd->object->object_to_world));
+  openvdb::Mat4d imat = openvdb::Mat4d((float *)ctx->object->world_to_object);
   /* `imat` had floating point issues and wasn't affine. */
   imat.setCol(3, openvdb::Vec4d(0, 0, 0, 1));
   transform->postMult(imat);