Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenSubdiv: Cleanup, use C++ range based loop

Browse Source 
Avoid indirection via define.
This commit is contained in:
Sergey Sharybin
2020-05-19 10:53:57 +02:00
parent be03a756e5
commit 98197343e8
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/opensubdiv/internal/evaluator/evaluator_impl.cc
View File

@@ -327,7 +327,7 @@ class VolatileEvalOutput {
// Create evaluators for every face varying channel. // Create evaluators for every face varying channel.
face_varying_evaluators.reserve(all_face_varying_stencils.size()); face_varying_evaluators.reserve(all_face_varying_stencils.size());
int face_varying_channel = 0; int face_varying_channel = 0;
foreach (const StencilTable *face_varying_stencils, all_face_varying_stencils) { for (const StencilTable *face_varying_stencils : all_face_varying_stencils) {
face_varying_evaluators.push_back(new FaceVaryingEval(face_varying_channel, face_varying_evaluators.push_back(new FaceVaryingEval(face_varying_channel,
face_varying_stencils, face_varying_stencils,
face_varying_width, face_varying_width,
@@ -345,7 +345,7 @@ class VolatileEvalOutput {
delete patch_table_; delete patch_table_;
delete vertex_stencils_; delete vertex_stencils_;
delete varying_stencils_; delete varying_stencils_;
foreach (FaceVaryingEval *face_varying_evaluator, face_varying_evaluators) { for (FaceVaryingEval *face_varying_evaluator : face_varying_evaluators) {
delete face_varying_evaluator; delete face_varying_evaluator;
} }
} }
@@ -414,7 +414,7 @@ class VolatileEvalOutput {
} }
// Evaluate face-varying data. // Evaluate face-varying data.
if (hasFaceVaryingData()) { if (hasFaceVaryingData()) {
foreach (FaceVaryingEval *face_varying_evaluator, face_varying_evaluators) { for (FaceVaryingEval *face_varying_evaluator : face_varying_evaluators) {
face_varying_evaluator->refine(); face_varying_evaluator->refine();
} }
} }
@@ -865,7 +865,7 @@ OpenSubdiv_EvaluatorImpl *openSubdiv_createEvaluatorInternal(
// TOOD(sergey): Look into whether we've got duplicated stencils arrays. // TOOD(sergey): Look into whether we've got duplicated stencils arrays.
delete vertex_stencils; delete vertex_stencils;
delete varying_stencils; delete varying_stencils;
foreach (const StencilTable *table, all_face_varying_stencils) { for (const StencilTable *table : all_face_varying_stencils) {
delete table; delete table;
} }
return evaluator_descr; return evaluator_descr;

2
intern/opensubdiv/internal/opensubdiv_util.h
View File

@@ -41,8 +41,6 @@ using std::swap;
using std::unordered_map; using std::unordered_map;
using std::vector; using std::vector;
#define foreach(x, y) for (x : y)
#define STRINGIFY_ARG(x) "" #x #define STRINGIFY_ARG(x) "" #x
#define STRINGIFY_APPEND(a, b) "" a #b #define STRINGIFY_APPEND(a, b) "" a #b
#define STRINGIFY(x) STRINGIFY_APPEND("", x) #define STRINGIFY(x) STRINGIFY_APPEND("", x)