Cycles: Fix compilation error and warning without OPENVDB

This commit is contained in:
Clément Foucault 2020-11-17 01:30:59 +01:00
parent 82b8c15684
commit 4095835db1
1 changed files with 9 additions and 0 deletions

View File

@ -76,6 +76,7 @@ enum {
QUAD_Z_MAX = 5,
};
#ifdef WITH_OPENVDB
const int quads_indices[6][4] = {
/* QUAD_X_MIN */
{4, 0, 3, 7},
@ -140,6 +141,7 @@ static void create_quad(int3 corners[8],
quads.push_back(quad);
}
#endif
/* Create a mesh from a volume.
*
@ -284,6 +286,7 @@ void VolumeMeshBuilder::create_mesh(vector<float3> &vertices,
vector<float3> &face_normals,
const float face_overlap_avoidance)
{
#ifdef WITH_OPENVDB
/* We create vertices in index space (is), and only convert them to object
* space when done. */
vector<int3> vertices_is;
@ -298,6 +301,12 @@ void VolumeMeshBuilder::create_mesh(vector<float3> &vertices,
convert_object_space(vertices_is, vertices, face_overlap_avoidance);
convert_quads_to_tris(quads, indices, face_normals);
#else
(void)vertices;
(void)indices;
(void)face_normals;
(void)face_overlap_avoidance;
#endif
}
void VolumeMeshBuilder::generate_vertices_and_quads(vector<ccl::int3> &vertices_is,