[Bf-blender-cvs] [a763e485d69] new-object-types: Fix failure loading copied volume datablocks
Brecht Van Lommel
noreply at git.blender.org
Tue Feb 25 19:29:53 CET 2020
Commit: a763e485d69a4f0ce744aa596ea7fa1b8651237e
Author: Brecht Van Lommel
Date: Tue Feb 25 19:10:16 2020 +0100
Branches: new-object-types
https://developer.blender.org/rBa763e485d69a4f0ce744aa596ea7fa1b8651237e
Fix failure loading copied volume datablocks
===================================================================
M source/blender/blenkernel/intern/volume.cc
M source/blender/editors/object/object_volume.c
===================================================================
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index c95da151bf3..581a71c4d47 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -394,7 +394,8 @@ struct VolumeGridVector : public std::list<VolumeGrid> {
filepath[0] = '\0';
}
- VolumeGridVector(const VolumeGridVector &other) : error_msg(other.error_msg)
+ VolumeGridVector(const VolumeGridVector &other)
+ : std::list<VolumeGrid>(other), error_msg(other.error_msg), metadata(other.metadata)
{
memcpy(filepath, other.filepath, sizeof(filepath));
}
diff --git a/source/blender/editors/object/object_volume.c b/source/blender/editors/object/object_volume.c
index 5a0458921f1..8ec574fdaa7 100644
--- a/source/blender/editors/object/object_volume.c
+++ b/source/blender/editors/object/object_volume.c
@@ -124,7 +124,6 @@ static int volume_import_exec(bContext *C, wmOperator *op)
"Volume %s contains points, only voxel grids are supported",
filename);
}
- BKE_volume_unload(volume);
imported = true;
}
More information about the Bf-blender-cvs
mailing list