Page MenuHome
Differential D8401 Diff 27149 intern/cycles/blender/blender_volume.cpp

Changeset View

Standalone View

View Options

intern/cycles/blender/blender_volume.cpp

Show First 20 Lines • Show All 259 Lines • ▼ Show 20 Lines#endif
{ {
/* TODO: detect multiple volume datablocks with the same filepath. */ /* TODO: detect multiple volume datablocks with the same filepath. */
const BlenderVolumeLoader &other_loader = (const BlenderVolumeLoader &)other; const BlenderVolumeLoader &other_loader = (const BlenderVolumeLoader &)other;
return b_volume == other_loader.b_volume && grid_name == other_loader.grid_name; return b_volume == other_loader.b_volume && grid_name == other_loader.grid_name;
} }
void cleanup() override void cleanup() override
{ {
VDBImageLoader::cleanup();
brechtUnsubmitted
Not Done
Inline Actions

Why was this removed?

brecht: Why was this removed?
kevindietrichAuthorUnsubmitted
Done
Inline Actions

Sorry, I forgot about that. This frees the OpenVDB grid before we can generate the mesh, so I removed it, and did not come back to it. I think I can just call VDBImageLoader::load_metadata to reload the grid.

kevindietrich: Sorry, I forgot about that. This frees the OpenVDB grid before we can generate the mesh, so I…
BL::VolumeGrid b_volume_grid = find_grid(); BL::VolumeGrid b_volume_grid = find_grid();
if (b_volume_grid && unload) { if (b_volume_grid && unload) {
b_volume_grid.unload(); b_volume_grid.unload();
} }
} }
/* Find grid with matching name. Grid point not stored in the class since /* Find grid with matching name. Grid point not stored in the class since
* grids may be unloaded before we load the pixels, for example for motion * grids may be unloaded before we load the pixels, for example for motion
▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines