[Bf-blender-cvs] [25a718aa902] master: Merge branch 'blender-v2.91-release' into master

[Jacques Lucke]

Commit: 25a718aa90210e34806158b677713571cf6d251e
Author: Jacques Lucke
Date:   Wed Nov 4 13:34:41 2020 +0100
Branches: master
https://developer.blender.org/rB25a718aa90210e34806158b677713571cf6d251e

Merge branch 'blender-v2.91-release' into master

===================================================================



===================================================================

diff --cc source/blender/modifiers/intern/MOD_volume_to_mesh.cc
index cd8c8e8b5e3,913a457c38d..a227824ab56
--- a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
+++ b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc
@@@ -281,10 -290,11 +290,11 @@@ static Mesh *modifyMesh(ModifierData *m
  
    Volume *volume = static_cast<Volume *>(vmmd->object->data);
  
+   BKE_volume_load(volume, DEG_get_bmain(ctx->depsgraph));
    VolumeGrid *volume_grid = BKE_volume_grid_find(volume, vmmd->grid_name);
    if (volume_grid == nullptr) {
 -    BKE_modifier_set_error(md, "Cannot find '%s' grid", vmmd->grid_name);
 +    BKE_modifier_set_error(vmmd->object, md, "Cannot find '%s' grid", vmmd->grid_name);
-     return input_mesh;
+     return create_empty_mesh(input_mesh);
    }
  
    const openvdb::GridBase::ConstPtr grid = BKE_volume_grid_openvdb_for_read(volume, volume_grid);
@@@ -292,8 -302,8 +302,8 @@@
    const VolumeGridType grid_type = BKE_volume_grid_type(volume_grid);
    VolumeToMeshOp to_mesh_op{*grid, *vmmd, *ctx};
    if (!BKE_volume_grid_type_operation(grid_type, to_mesh_op)) {
 -    BKE_modifier_set_error(md, "Expected a scalar grid");
 +    BKE_modifier_set_error(ctx->object, md, "Expected a scalar grid");
-     return input_mesh;
+     return create_empty_mesh(input_mesh);
    }
  
    Mesh *mesh = new_mesh_from_openvdb_data(to_mesh_op.verts, to_mesh_op.tris, to_mesh_op.quads);
@@@ -303,9 -313,9 +313,9 @@@
    }
    return mesh;
  #else
 -  UNUSED_VARS(md, ctx);
 -  BKE_modifier_set_error(md, "Compiled without OpenVDB");
 +  UNUSED_VARS(md);
 +  BKE_modifier_set_error(ctx->object, md, "Compiled without OpenVDB");
-   return input_mesh;
+   return create_empty_mesh(input_mesh);
  #endif
  }