[Bf-blender-cvs] [8f2c7b10cb4] temp-sculpt-colors: temp-sculpt-colors: add typename keywords to make gcc happy.
Joseph Eagar
noreply at git.blender.org
Fri Mar 11 10:22:47 CET 2022
Commit: 8f2c7b10cb464ada4251f9f7aff671736e6c5f43
Author: Joseph Eagar
Date: Fri Mar 11 01:22:26 2022 -0800
Branches: temp-sculpt-colors
https://developer.blender.org/rB8f2c7b10cb464ada4251f9f7aff671736e6c5f43
temp-sculpt-colors: add typename keywords to make
gcc happy.
===================================================================
M source/blender/blenkernel/intern/pbvh.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh.cc b/source/blender/blenkernel/intern/pbvh.cc
index 630cc498e27..2b319263e1c 100644
--- a/source/blender/blenkernel/intern/pbvh.cc
+++ b/source/blender/blenkernel/intern/pbvh.cc
@@ -134,7 +134,7 @@ static void pbvh_vertex_color_get(PBVH *pbvh, int vertex, float r_color[4])
const MPoly *mp = pbvh->mpoly + melem->indices[i];
const MLoop *ml = pbvh->mloop + mp->loopstart;
- Helper::ColType *col = static_cast<typename Helper::ColType *>(pbvh->vcol->data) + mp->loopstart;
+ typename Helper::ColType *col = static_cast<typename Helper::ColType *>(pbvh->vcol->data) + mp->loopstart;
for (int j = 0; j < mp->totloop; j++, col++, ml++) {
if (ml->v == vertex) {
@@ -152,7 +152,7 @@ static void pbvh_vertex_color_get(PBVH *pbvh, int vertex, float r_color[4])
}
}
else {
- Helper::ColType *col = static_cast<typename Helper::ColType *>(pbvh->vcol->data) + vertex;
+ typename Helper::ColType *col = static_cast<typename Helper::ColType *>(pbvh->vcol->data) + vertex;
Helper::toFloat(col, r_color);
}
}
@@ -177,7 +177,7 @@ static void pbvh_vertex_color_set(PBVH *pbvh, int vertex, const float color[4])
const MPoly *mp = pbvh->mpoly + melem->indices[i];
const MLoop *ml = pbvh->mloop + mp->loopstart;
- Helper::ColType *col = static_cast<typename Helper::ColType *>(pbvh->vcol->data) + mp->loopstart;
+ typename Helper::ColType *col = static_cast<typename Helper::ColType *>(pbvh->vcol->data) + mp->loopstart;
for (int j = 0; j < mp->totloop; j++, col++, ml++) {
if (ml->v == vertex) {
@@ -187,7 +187,7 @@ static void pbvh_vertex_color_set(PBVH *pbvh, int vertex, const float color[4])
}
}
else {
- Helper::ColType *col = static_cast<typename Helper::ColType *>(pbvh->vcol->data) + vertex;
+ typename Helper::ColType *col = static_cast<typename Helper::ColType *>(pbvh->vcol->data) + vertex;
Setter::setFloat(col, color);
}
}
@@ -206,7 +206,7 @@ template<typename Helper, typename Setter = ColorSetter<Helper>>
static void pbvh_set_colors(
PBVH *pbvh, void *color_attr, float (*colors)[4], int *indices, int totelem)
{
- Helper::ColType *col = reinterpret_cast<typename Helper::ColType *>(color_attr);
+ typename Helper::ColType *col = reinterpret_cast<typename Helper::ColType *>(color_attr);
for (int i : IndexRange(totelem)) {
Setter::setFloat(col + indices[i], colors[i]);
More information about the Bf-blender-cvs
mailing list