Merge branch 'blender-v3.1-release'
This commit is contained in:
commit
57013e2a44
|
@ -90,7 +90,6 @@ typedef enum VolumeGridType {
|
|||
VOLUME_GRID_INT,
|
||||
VOLUME_GRID_INT64,
|
||||
VOLUME_GRID_MASK,
|
||||
VOLUME_GRID_STRING,
|
||||
VOLUME_GRID_VECTOR_FLOAT,
|
||||
VOLUME_GRID_VECTOR_DOUBLE,
|
||||
VOLUME_GRID_VECTOR_INT,
|
||||
|
@ -204,8 +203,6 @@ auto BKE_volume_grid_type_operation(const VolumeGridType grid_type, OpType &&op)
|
|||
return op.template operator()<openvdb::Vec3IGrid>();
|
||||
case VOLUME_GRID_VECTOR_DOUBLE:
|
||||
return op.template operator()<openvdb::Vec3dGrid>();
|
||||
case VOLUME_GRID_STRING:
|
||||
return op.template operator()<openvdb::StringGrid>();
|
||||
case VOLUME_GRID_MASK:
|
||||
return op.template operator()<openvdb::MaskGrid>();
|
||||
case VOLUME_GRID_POINTS:
|
||||
|
|
|
@ -1331,9 +1331,6 @@ VolumeGridType BKE_volume_grid_type_openvdb(const openvdb::GridBase &grid)
|
|||
if (grid.isType<openvdb::Vec3dGrid>()) {
|
||||
return VOLUME_GRID_VECTOR_DOUBLE;
|
||||
}
|
||||
if (grid.isType<openvdb::StringGrid>()) {
|
||||
return VOLUME_GRID_STRING;
|
||||
}
|
||||
if (grid.isType<openvdb::MaskGrid>()) {
|
||||
return VOLUME_GRID_MASK;
|
||||
}
|
||||
|
@ -1369,7 +1366,6 @@ int BKE_volume_grid_channels(const VolumeGrid *grid)
|
|||
case VOLUME_GRID_VECTOR_DOUBLE:
|
||||
case VOLUME_GRID_VECTOR_INT:
|
||||
return 3;
|
||||
case VOLUME_GRID_STRING:
|
||||
case VOLUME_GRID_POINTS:
|
||||
case VOLUME_GRID_UNKNOWN:
|
||||
return 0;
|
||||
|
@ -1610,13 +1606,8 @@ struct CreateGridWithChangedResolutionOp {
|
|||
|
||||
template<typename GridType> typename openvdb::GridBase::Ptr operator()()
|
||||
{
|
||||
if constexpr (std::is_same_v<GridType, openvdb::StringGrid>) {
|
||||
return {};
|
||||
}
|
||||
else {
|
||||
return create_grid_with_changed_resolution(static_cast<const GridType &>(grid),
|
||||
resolution_factor);
|
||||
}
|
||||
return create_grid_with_changed_resolution(static_cast<const GridType &>(grid),
|
||||
resolution_factor);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -63,7 +63,6 @@ static void extract_dense_float_voxels(const VolumeGridType grid_type,
|
|||
case VOLUME_GRID_VECTOR_INT:
|
||||
return extract_dense_voxels<openvdb::Vec3IGrid, openvdb::Vec3f>(
|
||||
grid, bbox, reinterpret_cast<openvdb::Vec3f *>(r_voxels));
|
||||
case VOLUME_GRID_STRING:
|
||||
case VOLUME_GRID_POINTS:
|
||||
case VOLUME_GRID_UNKNOWN:
|
||||
/* Zero channels to copy. */
|
||||
|
|
|
@ -26,7 +26,6 @@ const EnumPropertyItem rna_enum_volume_grid_data_type_items[] = {
|
|||
{VOLUME_GRID_INT, "INT", 0, "Integer", "32-bit integer"},
|
||||
{VOLUME_GRID_INT64, "INT64", 0, "Integer 64-bit", "64-bit integer"},
|
||||
{VOLUME_GRID_MASK, "MASK", 0, "Mask", "No data, boolean mask of active voxels"},
|
||||
{VOLUME_GRID_STRING, "STRING", 0, "String", "Text string"},
|
||||
{VOLUME_GRID_VECTOR_FLOAT, "VECTOR_FLOAT", 0, "Float Vector", "3D float vector"},
|
||||
{VOLUME_GRID_VECTOR_DOUBLE, "VECTOR_DOUBLE", 0, "Double Vector", "3D double vector"},
|
||||
{VOLUME_GRID_VECTOR_INT, "VECTOR_INT", 0, "Integer Vector", "3D integer vector"},
|
||||
|
|
|
@ -189,10 +189,8 @@ struct DisplaceGridOp {
|
|||
|
||||
template<typename GridType> void operator()()
|
||||
{
|
||||
if constexpr (blender::is_same_any_v<GridType,
|
||||
openvdb::points::PointDataGrid,
|
||||
openvdb::StringGrid,
|
||||
openvdb::MaskGrid>) {
|
||||
if constexpr (blender::
|
||||
is_same_any_v<GridType, openvdb::points::PointDataGrid, openvdb::MaskGrid>) {
|
||||
/* We don't support displacing these grid types yet. */
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue