diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2020-11-17 06:10:51 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2020-11-17 06:10:51 +0300 |
| commit | 797dfa6a0a7d5d2bf62bdc03cf619addbc9e1064 (patch) | |
| tree | 5a1e0f0a6b2439ceee4a8e0bae82b243e3831156 /intern | |
| parent | 09045ff64d1f0948489354bd097f2930f45bacb9 (diff) | |
| parent | 75bd286813eb5e3c227696b4cfd5616b17166641 (diff) | |
Merge branch 'blender-v2.91-release'
Conflicts:
source/blender/editors/render/render_opengl.c
source/blender/sequencer/intern/effects.c
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/volume.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/intern/cycles/render/volume.cpp b/intern/cycles/render/volume.cpp index 85624d9af65..4baaae6856c 100644 --- a/intern/cycles/render/volume.cpp +++ b/intern/cycles/render/volume.cpp @@ -72,6 +72,7 @@ enum { QUAD_Z_MAX = 5, }; +#ifdef WITH_OPENVDB const int quads_indices[6][4] = { /* QUAD_X_MIN */ {4, 0, 3, 7}, @@ -136,6 +137,7 @@ static void create_quad(int3 corners[8], quads.push_back(quad); } +#endif /* Create a mesh from a volume. * @@ -280,6 +282,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; @@ -294,6 +297,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, |