[Bf-blender-cvs] [9e007b4673f] usd-importer-T81257-merge: Fixed build errors.

[makowalski]

Commit: 9e007b4673f48aa396c6cde8e384362a77bc3f1f
Author: makowalski
Date:   Fri Apr 9 14:29:38 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB9e007b4673f48aa396c6cde8e384362a77bc3f1f

Fixed build errors.

Fixed build errors after merge with master.

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

M	source/blender/io/usd/intern/usd_reader_volume.cc
M	source/blender/modifiers/intern/MOD_meshsequencecache.c

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

diff --git a/source/blender/io/usd/intern/usd_reader_volume.cc b/source/blender/io/usd/intern/usd_reader_volume.cc
index 5c41404d9d4..d5f624387d8 100644
--- a/source/blender/io/usd/intern/usd_reader_volume.cc
+++ b/source/blender/io/usd/intern/usd_reader_volume.cc
@@ -16,7 +16,6 @@
 
 #include "usd_reader_volume.h"
 
-extern "C" {
 #include "DNA_cachefile_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
@@ -46,7 +45,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 #include <pxr/pxr.h>
 #include <pxr/usd/usdVol/openVDBAsset.h>
@@ -76,7 +74,7 @@ void USDVolumeReader::read_object_data(Main *bmain, double motionSampleTime)
   std::string filepath;
 
   Volume *volume = (Volume *)object_->data;
-  VolumeGrid *defaultGrid = BKE_volume_grid_active_get(volume);
+  VolumeGrid *defaultGrid = BKE_volume_grid_get_for_write(volume, 0);
 
   for (auto it = fields.begin(); it != fields.end(); ++it) {
 
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 0ce7dfd2e28..67400b005fa 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -212,7 +212,6 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
         STRNCPY(mcmd->reader_object_path, mcmd->object_path);
         BKE_cachefile_reader_open(cache_file, &mcmd->reader, ctx->object, mcmd->object_path);
         if (!mcmd->reader) {
-          printf("Could not create usd reader\n");
           BKE_modifier_set_error(
               ctx->object, md, "Could not create USD reader for file %s", cache_file->filepath);
           return mesh;
@@ -223,7 +222,6 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
        * we must return the mesh as-is instead of deforming it. */
       if (ctx->flag & MOD_APPLY_ORCO &&
           !USD_mesh_topology_changed(mcmd->reader, ctx->object, mesh, time * FPS, &err_str)) {
-        printf("ORCO and no topology changed\n");
         return mesh;
       }