Commit: adf97edc8f42d2bb4fbc27f033c795e37495cdc0
Author: Sergey Sharybin
Date: Fri Jul 22 12:40:53 2016 +0200
Branches: master
https://developer.blender.org/rBadf97edc8f42d2bb4fbc27f033c795e37495cdc0
OpenSubdiv: Cleanup, don't use camel case for variable names
===================================================================
M intern/opensubdiv/opensubdiv_capi.cc
M intern/opensubdiv/opensubdiv_gpu_capi.cc
===================================================================
diff --git a/intern/opensubdiv/opensubdiv_capi.cc
b/intern/opensubdiv/opensubdiv_capi.cc
index e04b237..20f69d7 100644
--- a/intern/opensubdiv/opensubdiv_capi.cc
+++ b/intern/opensubdiv/opensubdiv_capi.cc
@@ -171,7 +171,7 @@ static void
interpolate_fvar_data(OpenSubdiv::Far::TopologyRefiner& refiner,
if (num_values_total <= 0) {
return;
}
- OpenSubdiv::Far::PrimvarRefiner primvarRefiner(refiner);
+ OpenSubdiv::Far::PrimvarRefiner primvar_refiner(refiner);
if (refiner.IsUniform()) {
/* For uniform we only keep the highest level of refinement. */
fvar_data.resize(num_values_max * fvar_width);
@@ -183,11 +183,11 @@ static void
interpolate_fvar_data(OpenSubdiv::Far::TopologyRefiner& refiner,
*/
for (int level = 1; level < max_level; ++level) {
FVarVertex *dst = src +
refiner.GetLevel(level-1).GetNumFVarValues(channel);
- primvarRefiner.InterpolateFaceVarying(level, src, dst,
channel);
+ primvar_refiner.InterpolateFaceVarying(level, src, dst,
channel);
src = dst;
}
FVarVertex *dst = reinterpret_cast<FVarVertex *>(&fvar_data[0]);
- primvarRefiner.InterpolateFaceVarying(max_level, src, dst,
channel);
+ primvar_refiner.InterpolateFaceVarying(max_level, src, dst,
channel);
} else {
/* For adaptive we keep all levels. */
fvar_data.resize(num_values_total * fvar_width);
@@ -195,7 +195,7 @@ static void
interpolate_fvar_data(OpenSubdiv::Far::TopologyRefiner& refiner,
memcpy(src, &uvs[0], uvs.size() * sizeof(float));
for (int level = 1; level <= max_level; ++level) {
FVarVertex *dst = src +
refiner.GetLevel(level-1).GetNumFVarValues(channel);
- primvarRefiner.InterpolateFaceVarying(level, src, dst,
channel);
+ primvar_refiner.InterpolateFaceVarying(level, src, dst,
channel);
src = dst;
}
}
diff --git a/intern/opensubdiv/opensubdiv_gpu_capi.cc
b/intern/opensubdiv/opensubdiv_gpu_capi.cc
index 84984e8..8329062 100644
--- a/intern/opensubdiv/opensubdiv_gpu_capi.cc
+++ b/intern/opensubdiv/opensubdiv_gpu_capi.cc
@@ -113,7 +113,7 @@ struct OpenSubdiv_GLMeshFVarData
}
void Create(const OpenSubdiv::Far::PatchTable *patch_table,
- int fvarWidth,
+ int fvar_width,
const float *fvar_src_data)
{
Release();
@@ -121,11 +121,11 @@ struct OpenSubdiv_GLMeshFVarData
// expand fvardata to per-patch array
std::vector<float> data;
- data.reserve(indices.size() * fvarWidth);
+ data.reserve(indices.size() * fvar_width);
for (int fvert = 0; fvert < (int)indices.size(); ++fvert) {
- int index = indices[fvert] * fvarWidth;
- for (int i = 0; i < fvarWidth; ++i) {
+ int index = indices[fvert] * fvar_width;
+ for (int i = 0; i < fvar_width; ++i) {
data.push_back(fvar_src_data[index++]);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
