archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use post increment/decrement

Browse Source 
When the result isn't used, prefer post increment/decrement
(already used nearly everywhere in Blender).
This commit is contained in:
Campbell Barton
2019-09-08 00:12:26 +10:00
parent ab823176d3
commit 0b2d1badec
217 changed files with 1114 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/alembic/intern/abc_curves.cc
+13 -13
View File
@@ -111,7 +111,7 @@ void AbcCurveWriter::do_write()
const BPoint *point = nurbs->bp;
for (int i = 0; i < totpoint; ++i, ++point) {
for (int i = 0; i < totpoint; i++, point++) {
copy_yup_from_zup(temp_vert.getValue(), point->vec);
verts.push_back(temp_vert);
weights.push_back(point->vec[3]);
@@ -127,7 +127,7 @@ void AbcCurveWriter::do_write()
const BezTriple *bezier = nurbs->bezt;
/* TODO(kevin): store info about handles, Alembic doesn't have this. */
for (int i = 0; i < totpoint; ++i, ++bezier) {
for (int i = 0; i < totpoint; i++, bezier++) {
copy_yup_from_zup(temp_vert.getValue(), bezier->vec[1]);
verts.push_back(temp_vert);
widths.push_back(bezier->radius);
@@ -144,7 +144,7 @@ void AbcCurveWriter::do_write()
* cyclic since other software need those.
*/
for (int i = 0; i < nurbs->orderu; ++i) {
for (int i = 0; i < nurbs->orderu; i++) {
verts.push_back(verts[i]);
}
}
@@ -156,7 +156,7 @@ void AbcCurveWriter::do_write()
* require/expect them. */
knots.resize(num_knots + 2);
for (int i = 0; i < num_knots; ++i) {
for (int i = 0; i < num_knots; i++) {
knots[i + 1] = nurbs->knotsu[i];
}
@@ -316,7 +316,7 @@ void AbcCurveReader::read_curve_sample(Curve *cu,
int knot_offset = 0;
size_t idx = 0;
for (size_t i = 0; i < num_vertices->size(); ++i) {
for (size_t i = 0; i < num_vertices->size(); i++) {
const int num_verts = (*num_vertices)[i];
Nurb *nu = static_cast<Nurb *>(MEM_callocN(sizeof(Nurb), "abc_getnurb"));
@@ -357,7 +357,7 @@ void AbcCurveReader::read_curve_sample(Curve *cu,
const int end = idx + num_verts;
int overlap = 0;
for (int j = start, k = end - nu->orderu; j < nu->orderu; ++j, ++k) {
for (int j = start, k = end - nu->orderu; j < nu->orderu; j++, k++) {
const Imath::V3f &p1 = (*positions)[j];
const Imath::V3f &p2 = (*positions)[k];
@@ -365,7 +365,7 @@ void AbcCurveReader::read_curve_sample(Curve *cu,
break;
}
++overlap;
overlap++;
}
/* TODO: Special case, need to figure out how it coincides with knots. */
@@ -393,7 +393,7 @@ void AbcCurveReader::read_curve_sample(Curve *cu,
nu->bp = static_cast<BPoint *>(MEM_callocN(sizeof(BPoint) * nu->pntsu, "abc_getnurb"));
BPoint *bp = nu->bp;
for (int j = 0; j < nu->pntsu; ++j, ++bp, ++idx) {
for (int j = 0; j < nu->pntsu; j++, bp++, idx++) {
const Imath::V3f &pos = (*positions)[idx];
if (do_radius) {
@@ -418,7 +418,7 @@ void AbcCurveReader::read_curve_sample(Curve *cu,
/* TODO: second check is temporary, for until the check for cycles is rock solid. */
if (periodicity == Alembic::AbcGeom::kPeriodic && (KNOTSU(nu) == knots->size() - 2)) {
/* Skip first and last knots. */
for (size_t i = 1; i < knots->size() - 1; ++i) {
for (size_t i = 1; i < knots->size() - 1; i++) {
nu->knotsu[i - 1] = (*knots)[knot_offset + i];
}
}
@@ -476,7 +476,7 @@ Mesh *AbcCurveReader::read_mesh(Mesh *existing_mesh,
if (same_topology) {
Nurb *nurbs = static_cast<Nurb *>(curve->nurb.first);
for (curve_idx = 0; nurbs; nurbs = nurbs->next, ++curve_idx) {
for (curve_idx = 0; nurbs; nurbs = nurbs->next, curve_idx++) {
const int num_in_alembic = (*num_vertices)[curve_idx];
const int num_in_blender = nurbs->pntsu;
@@ -493,13 +493,13 @@ Mesh *AbcCurveReader::read_mesh(Mesh *existing_mesh,
}
else {
Nurb *nurbs = static_cast<Nurb *>(curve->nurb.first);
for (curve_idx = 0; nurbs; nurbs = nurbs->next, ++curve_idx) {
for (curve_idx = 0; nurbs; nurbs = nurbs->next, curve_idx++) {
const int totpoint = (*num_vertices)[curve_idx];
if (nurbs->bp) {
BPoint *point = nurbs->bp;
for (int i = 0; i < totpoint; ++i, ++point, ++vertex_idx) {
for (int i = 0; i < totpoint; i++, point++, vertex_idx++) {
const Imath::V3f &pos = (*positions)[vertex_idx];
copy_zup_from_yup(point->vec, pos.getValue());
}
@@ -507,7 +507,7 @@ Mesh *AbcCurveReader::read_mesh(Mesh *existing_mesh,
else if (nurbs->bezt) {
BezTriple *bezier = nurbs->bezt;
for (int i = 0; i < totpoint; ++i, ++bezier, ++vertex_idx) {
for (int i = 0; i < totpoint; i++, bezier++, vertex_idx++) {
const Imath::V3f &pos = (*positions)[vertex_idx];
copy_zup_from_yup(bezier->vec[1], pos.getValue());
}
source/blender/alembic/intern/abc_customdata.cc
+17 -17
View File
@@ -72,12 +72,12 @@ static void get_uvs(const CDStreamConfig &config,
uvs.resize(config.totloop);
/* Iterate in reverse order to match exported polygons. */
for (int i = 0; i < num_poly; ++i) {
for (int i = 0; i < num_poly; i++) {
MPoly &current_poly = polygons[i];
MLoopUV *loopuv = mloopuv_array + current_poly.loopstart + current_poly.totloop;
for (int j = 0; j < current_poly.totloop; ++j, ++cnt) {
--loopuv;
for (int j = 0; j < current_poly.totloop; j++, cnt++) {
loopuv--;
uvidx[cnt] = cnt;
uvs[cnt][0] = loopuv->uv[0];
@@ -90,14 +90,14 @@ static void get_uvs(const CDStreamConfig &config,
std::vector<std::vector<uint32_t>> idx_map(config.totvert);
int idx_count = 0;
for (int i = 0; i < num_poly; ++i) {
for (int i = 0; i < num_poly; i++) {
MPoly &current_poly = polygons[i];
MLoop *looppoly = mloop + current_poly.loopstart + current_poly.totloop;
MLoopUV *loopuv = mloopuv_array + current_poly.loopstart + current_poly.totloop;
for (int j = 0; j < current_poly.totloop; ++j) {
--looppoly;
--loopuv;
for (int j = 0; j < current_poly.totloop; j++) {
looppoly--;
loopuv--;
Imath::V2f uv(loopuv->uv[0], loopuv->uv[1]);
bool found_same = false;
@@ -188,12 +188,12 @@ static void write_mcol(const OCompoundProperty &prop,
Imath::C4f col;
for (int i = 0; i < config.totpoly; ++i) {
for (int i = 0; i < config.totpoly; i++) {
MPoly *p = &polys[i];
MCol *cface = &cfaces[p->loopstart + p->totloop];
MLoop *mloop = &mloops[p->loopstart + p->totloop];
for (int j = 0; j < p->totloop; ++j) {
for (int j = 0; j < p->totloop; j++) {
cface--;
mloop--;
@@ -230,7 +230,7 @@ void write_custom_data(const OCompoundProperty &prop,
const int active_layer = CustomData_get_active_layer(data, cd_data_type);
const int tot_layers = CustomData_number_of_layers(data, cd_data_type);
for (int i = 0; i < tot_layers; ++i) {
for (int i = 0; i < tot_layers; i++) {
void *cd_data = CustomData_get_layer_n(data, cd_data_type, i);
const char *name = CustomData_get_layer_name(data, cd_data_type, i);
@@ -268,11 +268,11 @@ static void read_uvs(const CDStreamConfig &config,
unsigned int uv_index, loop_index, rev_loop_index;
for (int i = 0; i < config.totpoly; ++i) {
for (int i = 0; i < config.totpoly; i++) {
MPoly &poly = mpolys[i];
unsigned int rev_loop_offset = poly.loopstart + poly.totloop - 1;
for (int f = 0; f < poly.totloop; ++f) {
for (int f = 0; f < poly.totloop; f++) {
loop_index = poly.loopstart + f;
rev_loop_index = rev_loop_offset - f;
uv_index = (*indices)[loop_index];
@@ -368,14 +368,14 @@ static void read_custom_data_mcols(const std::string &iobject_full_name,
* is why we have to check for indices->size() > 0 */
bool use_dual_indexing = is_facevarying && indices->size() > 0;
for (int i = 0; i < config.totpoly; ++i) {
for (int i = 0; i < config.totpoly; i++) {
MPoly *poly = &mpolys[i];
MCol *cface = &cfaces[poly->loopstart + poly->totloop];
MLoop *mloop = &mloops[poly->loopstart + poly->totloop];
for (int j = 0; j < poly->totloop; ++j, ++face_index) {
--cface;
--mloop;
for (int j = 0; j < poly->totloop; j++, face_index++) {
cface--;
mloop--;
color_index = is_facevarying ? face_index : mloop->v;
if (use_dual_indexing) {
@@ -456,7 +456,7 @@ void read_custom_data(const std::string &iobject_full_name,
const size_t num_props = prop.getNumProperties();
for (size_t i = 0; i < num_props; ++i) {
for (size_t i = 0; i < num_props; i++) {
const Alembic::Abc::PropertyHeader &prop_header = prop.getPropertyHeader(i);
/* Read UVs according to convention. */
source/blender/alembic/intern/abc_exporter.cc
+8 -8
View File
@@ -197,12 +197,12 @@ AbcExporter::~AbcExporter()
{
/* Free xforms map */
m_xforms_type::iterator it_x, e_x;
for (it_x = m_xforms.begin(), e_x = m_xforms.end(); it_x != e_x; ++it_x) {
for (it_x = m_xforms.begin(), e_x = m_xforms.end(); it_x != e_x; it_x++) {
delete it_x->second;
}
/* Free shapes vector */
for (int i = 0, e = m_shapes.size(); i != e; ++i) {
for (int i = 0, e = m_shapes.size(); i != e; i++) {
delete m_shapes[i];
}
@@ -223,7 +223,7 @@ void AbcExporter::getShutterSamples(unsigned int nr_of_samples,
double time_inc = (shutter_close - shutter_open) / nr_of_samples;
/* sample between shutter open & close */
for (int sample = 0; sample < nr_of_samples; ++sample) {
for (int sample = 0; sample < nr_of_samples; sample++) {
double sample_time = shutter_open + time_inc * sample;
double time = (frame_offset + sample_time) / time_factor;
@@ -257,7 +257,7 @@ void AbcExporter::getFrameSet(unsigned int nr_of_samples, std::set<double> &fram
getShutterSamples(nr_of_samples, false, shutter_samples);
for (double frame = m_settings.frame_start; frame <= m_settings.frame_end; frame += 1.0) {
for (size_t j = 0; j < nr_of_samples; ++j) {
for (size_t j = 0; j < nr_of_samples; j++) {
frames.insert(frame + shutter_samples[j]);
}
}
@@ -331,7 +331,7 @@ void AbcExporter::operator()(float &progress, bool &was_canceled)
const float size = static_cast<float>(frames.size());
size_t i = 0;
for (; begin != end; ++begin) {
for (; begin != end; begin++) {
progress = (++i / size);
if (G.is_break) {
@@ -345,7 +345,7 @@ void AbcExporter::operator()(float &progress, bool &was_canceled)
setCurrentFrame(m_bmain, frame);
if (shape_frames.count(frame) != 0) {
for (int i = 0, e = m_shapes.size(); i != e; ++i) {
for (int i = 0, e = m_shapes.size(); i != e; i++) {
m_shapes[i]->write();
}
}
@@ -355,14 +355,14 @@ void AbcExporter::operator()(float &progress, bool &was_canceled)
}
m_xforms_type::iterator xit, xe;
for (xit = m_xforms.begin(), xe = m_xforms.end(); xit != xe; ++xit) {
for (xit = m_xforms.begin(), xe = m_xforms.end(); xit != xe; xit++) {
xit->second->write();
}
/* Save the archive 's bounding box. */
Imath::Box3d bounds;
for (xit = m_xforms.begin(), xe = m_xforms.end(); xit != xe; ++xit) {
for (xit = m_xforms.begin(), xe = m_xforms.end(); xit != xe; xit++) {
Imath::Box3d box = xit->second->bounds();
bounds.extendBy(box);
}
source/blender/alembic/intern/abc_hair.cc
+7 -7
View File
@@ -139,7 +139,7 @@ void AbcHairWriter::write_hair_sample(Mesh *mesh,
float normal[3];
Imath::V3f tmp_nor;
for (int p = 0; p < m_psys->totpart; ++p, ++pa) {
for (int p = 0; p < m_psys->totpart; p++, pa++) {
/* underlying info for faces-only emission */
path = cache[p];
@@ -173,7 +173,7 @@ void AbcHairWriter::write_hair_sample(Mesh *mesh,
const int num = (pa->num_dmcache >= 0) ? pa->num_dmcache : pa->num;
/* iterate over all faces to find a corresponding underlying UV */
for (int n = 0; n < mesh->totface; ++n) {
for (int n = 0; n < mesh->totface; n++) {
MFace *face = &mface[n];
MTFace *tface = mtface + n;
unsigned int vtx[4];
@@ -183,7 +183,7 @@ void AbcHairWriter::write_hair_sample(Mesh *mesh,
vtx[3] = face->v4;
bool found = false;
for (int o = 0; o < 4; ++o) {
for (int o = 0; o < 4; o++) {
if (o > 2 && vtx[o] == 0) {
break;
}
@@ -210,7 +210,7 @@ void AbcHairWriter::write_hair_sample(Mesh *mesh,
int steps = path->segments + 1;
hvertices.push_back(steps);
for (k = 0; k < steps; ++k, ++path) {
for (k = 0; k < steps; k++, path++) {
float vert[3];
copy_v3_v3(vert, path->co);
mul_m4_v3(inv_mat, vert);
@@ -240,7 +240,7 @@ void AbcHairWriter::write_hair_child_sample(Mesh *mesh,
ChildParticle *pc = m_psys->child;
for (int p = 0; p < m_psys->totchild; ++p, ++pc) {
for (int p = 0; p < m_psys->totchild; p++, pc++) {
path = cache[p];
if (part->from == PART_FROM_FACE && part->childtype != PART_CHILD_PARTICLES && mtface) {
@@ -278,7 +278,7 @@ void AbcHairWriter::write_hair_child_sample(Mesh *mesh,
int steps = path->segments + 1;
hvertices.push_back(steps);
for (int k = 0; k < steps; ++k) {
for (int k = 0; k < steps; k++) {
float vert[3];
copy_v3_v3(vert, path->co);
mul_m4_v3(inv_mat, vert);
@@ -286,7 +286,7 @@ void AbcHairWriter::write_hair_child_sample(Mesh *mesh,
/* Convert Z-up to Y-up. */
verts.push_back(Imath::V3f(vert[0], vert[2], -vert[1]));
++path;
path++;
}
}
}
source/blender/alembic/intern/abc_mesh.cc
+25 -25
View File
@@ -116,7 +116,7 @@ static void get_vertices(struct Mesh *mesh, std::vector<Imath::V3f> &points)
MVert *verts = mesh->mvert;
for (int i = 0, e = mesh->totvert; i < e; ++i) {
for (int i = 0, e = mesh->totvert; i < e; i++) {
copy_yup_from_zup(points[i].getValue(), verts[i].co);
}
}
@@ -137,7 +137,7 @@ static void get_topology(struct Mesh *mesh,
loop_counts.reserve(num_poly);
/* NOTE: data needs to be written in the reverse order. */
for (int i = 0; i < num_poly; ++i) {
for (int i = 0; i < num_poly; i++) {
MPoly &poly = mpoly[i];
loop_counts.push_back(poly.totloop);
@@ -145,7 +145,7 @@ static void get_topology(struct Mesh *mesh,
MLoop *loop = mloop + poly.loopstart + (poly.totloop - 1);
for (int j = 0; j < poly.totloop; ++j, --loop) {
for (int j = 0; j < poly.totloop; j++, loop--) {
poly_verts.push_back(loop->v);
}
}
@@ -164,7 +164,7 @@ static void get_creases(struct Mesh *mesh,
MEdge *edge = mesh->medge;
for (int i = 0, e = mesh->totedge; i < e; ++i) {
for (int i = 0, e = mesh->totedge; i < e; i++) {
const float sharpness = static_cast<float>(edge[i].crease) * factor;
if (sharpness != 0.0f) {
@@ -185,7 +185,7 @@ static void get_vertex_normals(struct Mesh *mesh, std::vector<Imath::V3f> &norma
MVert *verts = mesh->mvert;
float no[3];
for (int i = 0, e = mesh->totvert; i < e; ++i) {
for (int i = 0, e = mesh->totvert; i < e; i++) {
normal_short_to_float_v3(no, verts[i].no);
copy_yup_from_zup(normals[i].getValue(), no);
}
@@ -209,8 +209,8 @@ static void get_loop_normals(struct Mesh *mesh, std::vector<Imath::V3f> &normals
int abc_index = 0;
if (lnors) {
for (int i = 0, e = mesh->totpoly; i < e; ++i, ++mp) {
for (int j = mp->totloop - 1; j >= 0; --j, ++abc_index) {
for (int i = 0, e = mesh->totpoly; i < e; i++, mp++) {
for (int j = mp->totloop - 1; j >= 0; j--, abc_index++) {
int blender_index = mp->loopstart + j;
copy_yup_from_zup(normals[abc_index].getValue(), lnors[blender_index]);
}
@@ -219,20 +219,20 @@ static void get_loop_normals(struct Mesh *mesh, std::vector<Imath::V3f> &normals
else {
float no[3];
for (int i = 0, e = mesh->totpoly; i < e; ++i, ++mp) {
for (int i = 0, e = mesh->totpoly; i < e; i++, mp++) {
ml = mloop + mp->loopstart + (mp->totloop - 1);
/* Flat shaded, use common normal for all verts. */
if ((mp->flag & ME_SMOOTH) == 0) {
BKE_mesh_calc_poly_normal(mp, ml - (mp->totloop - 1), verts, no);
for (int j = 0; j < mp->totloop; --ml, ++j, ++abc_index) {
for (int j = 0; j < mp->totloop; ml--, j++, abc_index++) {
copy_yup_from_zup(normals[abc_index].getValue(), no);
}
}
else {
/* Smooth shaded, use individual vert normals. */
for (int j = 0; j < mp->totloop; --ml, ++j, ++abc_index) {
for (int j = 0; j < mp->totloop; ml--, j++, abc_index++) {
normal_short_to_float_v3(no, verts[ml->v].no);
copy_yup_from_zup(normals[abc_index].getValue(), no);
}
@@ -525,7 +525,7 @@ template<typename Schema> void AbcGenericMeshWriter::writeFaceSets(struct Mesh *
getGeoGroups(me, geo_groups);
std::map<std::string, std::vector<int32_t>>::iterator it;
for (it = geo_groups.begin(); it != geo_groups.end(); ++it) {
for (it = geo_groups.begin(); it != geo_groups.end(); it++) {
OFaceSet face_set = schema.createFaceSet(it->first);
OFaceSetSchema::Sample samp;
samp.setFaces(Int32ArraySample(it->second));
@@ -615,7 +615,7 @@ void AbcGenericMeshWriter::getVelocities(struct Mesh *mesh, std::vector<Imath::V
if (fss->meshVelocities) {
float *mesh_vels = reinterpret_cast<float *>(fss->meshVelocities);
for (int i = 0; i < totverts; ++i) {
for (int i = 0; i < totverts; i++) {
copy_yup_from_zup(vels[i].getValue(), mesh_vels);
mesh_vels += 3;
}
@@ -631,7 +631,7 @@ void AbcGenericMeshWriter::getGeoGroups(struct Mesh *mesh,
const int num_poly = mesh->totpoly;
MPoly *polygons = mesh->mpoly;
for (int i = 0; i < num_poly; ++i) {
for (int i = 0; i < num_poly; i++) {
MPoly &current_poly = polygons[i];
short mnr = current_poly.mat_nr;
@@ -658,7 +658,7 @@ void AbcGenericMeshWriter::getGeoGroups(struct Mesh *mesh,
std::vector<int32_t> faceArray;
for (int i = 0, e = mesh->totface; i < e; ++i) {
for (int i = 0, e = mesh->totface; i < e; i++) {
faceArray.push_back(i);
}
@@ -707,7 +707,7 @@ static void assign_materials(Main *bmain,
std::map<std::string, int>::const_iterator it = mat_index_map.begin();
int matcount = 0;
for (; it != mat_index_map.end(); ++it, ++matcount) {
for (; it != mat_index_map.end(); it++, matcount++) {
if (!BKE_object_material_slot_add(bmain, ob)) {
can_assign = false;
break;
@@ -723,7 +723,7 @@ static void assign_materials(Main *bmain,
if (can_assign) {
it = mat_index_map.begin();
for (; it != mat_index_map.end(); ++it) {
for (; it != mat_index_map.end(); it++) {
std::string mat_name = it->first;
mat_iter = mat_map.find(mat_name.c_str());
@@ -770,7 +770,7 @@ static void read_mverts_interp(MVert *mverts,
const float weight)
{
float tmp[3];
for (int i = 0; i < positions->size(); ++i) {
for (int i = 0; i < positions->size(); i++) {
MVert &mvert = mverts[i];
const Imath::V3f &floor_pos = (*positions)[i];
const Imath::V3f &ceil_pos = (*ceil_positions)[i];
@@ -801,7 +801,7 @@ void read_mverts(MVert *mverts,
const P3fArraySamplePtr &positions,
const N3fArraySamplePtr &normals)
{
for (int i = 0; i < positions->size(); ++i) {
for (int i = 0; i < positions->size(); i++) {
MVert &mvert = mverts[i];
Imath::V3f pos_in = (*positions)[i];
@@ -839,7 +839,7 @@ static void read_mpolys(CDStreamConfig &config, const AbcMeshData &mesh_data)
unsigned int rev_loop_index = 0;
unsigned int uv_index = 0;
for (int i = 0; i < face_counts->size(); ++i) {
for (int i = 0; i < face_counts->size(); i++) {
const int face_size = (*face_counts)[i];
MPoly &poly = mpolys[i];
@@ -856,7 +856,7 @@ static void read_mpolys(CDStreamConfig &config, const AbcMeshData &mesh_data)
/* NOTE: Alembic data is stored in the reverse order. */
rev_loop_index = loop_index + (face_size - 1);
for (int f = 0; f < face_size; ++f, ++loop_index, --rev_loop_index) {
for (int f = 0; f < face_size; f++, loop_index++, rev_loop_index--) {
MLoop &loop = mloops[rev_loop_index];
loop.v = (*face_indices)[loop_index];
@@ -899,9 +899,9 @@ static void process_normals(CDStreamConfig &config, const AbcMeshData &mesh_data
MPoly *mpoly = mesh->mpoly;
int abc_index = 0;
for (int i = 0, e = mesh->totpoly; i < e; ++i, ++mpoly) {
for (int i = 0, e = mesh->totpoly; i < e; i++, mpoly++) {
/* As usual, ABC orders the loops in reverse. */
for (int j = mpoly->totloop - 1; j >= 0; --j, ++abc_index) {
for (int j = mpoly->totloop - 1; j >= 0; j--, abc_index++) {
int blender_index = mpoly->loopstart + j;
copy_zup_from_yup(lnors[blender_index], loop_normals[abc_index].getValue());
}
@@ -1246,7 +1246,7 @@ void AbcMeshReader::assign_facesets_to_mpoly(const ISampleSelector &sample_sel,
int current_mat = 0;
for (int i = 0; i < face_sets.size(); ++i) {
for (int i = 0; i < face_sets.size(); i++) {
const std::string &grp_name = face_sets[i];
if (r_mat_map.find(grp_name) == r_mat_map.end()) {
@@ -1292,7 +1292,7 @@ void AbcMeshReader::readFaceSetsSample(Main *bmain, Mesh *mesh, const ISampleSel
ABC_INLINE MEdge *find_edge(MEdge *edges, int totedge, int v1, int v2)
{
for (int i = 0, e = totedge; i < e; ++i) {
for (int i = 0, e = totedge; i < e; i++) {
MEdge &edge = edges[i];
if (edge.v1 == v1 && edge.v2 == v2) {
@@ -1419,7 +1419,7 @@ void AbcSubDReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSelec
MEdge *edges = mesh->medge;
if (indices && sharpnesses) {
for (int i = 0, s = 0, e = indices->size(); i < e; i += 2, ++s) {
for (int i = 0, s = 0, e = indices->size(); i < e; i += 2, s++) {
MEdge *edge = find_edge(edges, mesh->totedge, (*indices)[i], (*indices)[i + 1]);
if (edge) {
source/blender/alembic/intern/abc_nurbs.cc
+9 -9
View File
@@ -74,7 +74,7 @@ AbcNurbsWriter::AbcNurbsWriter(Object *ob,
Curve *curve = static_cast<Curve *>(m_object->data);
size_t numNurbs = BLI_listbase_count(&curve->nurb);
for (size_t i = 0; i < numNurbs; ++i) {
for (size_t i = 0; i < numNurbs; i++) {
std::stringstream str;
str << m_name << '_' << i;
@@ -106,7 +106,7 @@ static void get_knots(std::vector<float> &knots, const int num_knots, float *nu_
knots.push_back(0.0f);
for (int i = 0; i < num_knots; ++i) {
for (int i = 0; i < num_knots; i++) {
knots.push_back(nu_knots[i]);
}
@@ -136,7 +136,7 @@ void AbcNurbsWriter::do_write()
}
size_t count = 0;
for (Nurb *nu = static_cast<Nurb *>(nulb->first); nu; nu = nu->next, ++count) {
for (Nurb *nu = static_cast<Nurb *>(nulb->first); nu; nu = nu->next, count++) {
std::vector<float> knotsU;
get_knots(knotsU, KNOTSU(nu), nu->knotsu);
@@ -149,7 +149,7 @@ void AbcNurbsWriter::do_write()
const BPoint *bp = nu->bp;
for (int i = 0; i < size; ++i, ++bp) {
for (int i = 0; i < size; i++, bp++) {
copy_yup_from_zup(positions[i].getValue(), bp->vec);
weights[i] = bp->vec[3];
}
@@ -208,7 +208,7 @@ bool AbcNurbsReader::valid() const
}
std::vector<std::pair<INuPatchSchema, IObject>>::const_iterator it;
for (it = m_schemas.begin(); it != m_schemas.end(); ++it) {
for (it = m_schemas.begin(); it != m_schemas.end(); it++) {
const INuPatchSchema &schema = it->first;
if (!schema.valid()) {
@@ -229,7 +229,7 @@ static bool set_knots(const FloatArraySamplePtr &knots, float *&nu_knots)
const size_t num_knots = knots->size() - 2;
nu_knots = static_cast<float *>(MEM_callocN(num_knots * sizeof(float), "abc_setsplineknotsu"));
for (size_t i = 0; i < num_knots; ++i) {
for (size_t i = 0; i < num_knots; i++) {
nu_knots[i] = (*knots)[i + 1];
}
@@ -243,7 +243,7 @@ void AbcNurbsReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSele
std::vector<std::pair<INuPatchSchema, IObject>>::iterator it;
for (it = m_schemas.begin(); it != m_schemas.end(); ++it) {
for (it = m_schemas.begin(); it != m_schemas.end(); it++) {
Nurb *nu = static_cast<Nurb *>(MEM_callocN(sizeof(Nurb), "abc_getnurb"));
nu->flag = CU_SMOOTH;
nu->type = CU_NURBS;
@@ -281,7 +281,7 @@ void AbcNurbsReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSele
BPoint *bp = nu->bp;
float posw_in = 1.0f;
for (int i = 0; i < num_points; ++i, ++bp) {
for (int i = 0; i < num_points; i++, bp++) {
const Imath::V3f &pos_in = (*positions)[i];
if (weights) {
@@ -349,7 +349,7 @@ void AbcNurbsReader::getNurbsPatches(const IObject &obj)
return;
}
for (int i = 0; i < num_children; ++i) {
for (int i = 0; i < num_children; i++) {
bool ok = true;
IObject child(obj, obj.getChildHeader(i).getName());
source/blender/alembic/intern/abc_object.cc
+8 -8
View File
@@ -195,14 +195,14 @@ static Imath::M44d blend_matrices(const Imath::M44d &m0, const Imath::M44d &m1,
* the matrices manually.
*/
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) {
for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
mat0[i][j] = static_cast<float>(m0[i][j]);
}
}
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) {
for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
mat1[i][j] = static_cast<float>(m1[i][j]);
}
}
@@ -211,8 +211,8 @@ static Imath::M44d blend_matrices(const Imath::M44d &m0, const Imath::M44d &m1,
Imath::M44d m;
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) {
for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
m[i][j] = ret[i][j];
}
}
@@ -389,11 +389,11 @@ int AbcObjectReader::refcount() const
void AbcObjectReader::incref()
{
++m_refcount;
m_refcount++;
}
void AbcObjectReader::decref()
{
--m_refcount;
m_refcount--;
BLI_assert(m_refcount >= 0);
}
source/blender/alembic/intern/abc_transform.cc
+1 -1
View File
@@ -122,7 +122,7 @@ Imath::Box3d AbcTransformWriter::bounds()
{
Imath::Box3d bounds;
for (int i = 0; i < m_children.size(); ++i) {
for (int i = 0; i < m_children.size(); i++) {
Imath::Box3d box(m_children[i]->bounds());
bounds.extendBy(box);
}
source/blender/alembic/intern/abc_util.cc
+4 -4
View File
@@ -90,8 +90,8 @@ Imath::M44d convert_matrix(float mat[4][4])
{
Imath::M44d m;
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) {
for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
m[i][j] = mat[i][j];
}
}
@@ -226,8 +226,8 @@ void copy_m44_axis_swap(float dst_mat[4][4], float src_mat[4][4], AbcAxisSwapMod
void convert_matrix(const Imath::M44d &xform, Object *ob, float r_mat[4][4])
{
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) {
for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
r_mat[i][j] = static_cast<float>(xform[i][j]);
}
}
source/blender/alembic/intern/alembic_capi.cc
+9 -9
View File
@@ -129,7 +129,7 @@ static bool gather_objects_paths(const IObject &object, ListBase *object_paths)
size_t children_claiming_this_object = 0;
size_t num_children = object.getNumChildren();
for (size_t i = 0; i < num_children; ++i) {
for (size_t i = 0; i < num_children; i++) {
bool child_claims_this_object = gather_objects_paths(object.getChild(i), object_paths);
children_claiming_this_object += child_claims_this_object ? 1 : 0;
}
@@ -211,7 +211,7 @@ static void find_iobject(const IObject &object, IObject &ret, const std::string
IObject tmp = object;
std::vector<std::string>::iterator iter;
for (iter = tokens.begin(); iter != tokens.end(); ++iter) {
for (iter = tokens.begin(); iter != tokens.end(); iter++) {
IObject child = tmp.getChild(*iter);
tmp = child;
}
@@ -452,7 +452,7 @@ static std::pair<bool, AbcObjectReader *> visit_object(
AbcObjectReader::ptr_vector claiming_child_readers;
AbcObjectReader::ptr_vector nonclaiming_child_readers;
AbcObjectReader::ptr_vector assign_as_parent;
for (size_t i = 0; i < num_children; ++i) {
for (size_t i = 0; i < num_children; i++) {
const IObject ichild = object.getChild(i);
/* TODO: When we only support C++11, use std::tie() instead. */
@@ -704,7 +704,7 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
ISampleSelector sample_sel(0.0f);
std::vector<AbcObjectReader *>::iterator iter;
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
for (iter = data->readers.begin(); iter != data->readers.end(); iter++) {
AbcObjectReader *reader = *iter;
if (reader->valid()) {
@@ -743,7 +743,7 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
}
/* Setup parenthood. */
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
for (iter = data->readers.begin(); iter != data->readers.end(); iter++) {
const AbcObjectReader *reader = *iter;
const AbcObjectReader *parent_reader = reader->parent_reader;
Object *ob = reader->object();
@@ -758,7 +758,7 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
/* Setup transformations and constraints. */
i = 0;
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
for (iter = data->readers.begin(); iter != data->readers.end(); iter++) {
AbcObjectReader *reader = *iter;
reader->setupObjectTransform(0.0f);
@@ -782,7 +782,7 @@ static void import_endjob(void *user_data)
/* Delete objects on cancellation. */
if (data->was_cancelled) {
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
for (iter = data->readers.begin(); iter != data->readers.end(); iter++) {
Object *ob = (*iter)->object();
/* It's possible that cancellation occurred between the creation of
@@ -804,7 +804,7 @@ static void import_endjob(void *user_data)
lc = BKE_layer_collection_get_active(view_layer);
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
for (iter = data->readers.begin(); iter != data->readers.end(); iter++) {
Object *ob = (*iter)->object();
BKE_collection_object_add(data->bmain, lc->collection, ob);
@@ -824,7 +824,7 @@ static void import_endjob(void *user_data)
DEG_relations_tag_update(data->bmain);
}
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
for (iter = data->readers.begin(); iter != data->readers.end(); iter++) {
AbcObjectReader *reader = *iter;
reader->decref();
source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c
+2 -2
View File
@@ -697,7 +697,7 @@ static void opensubdiv_evaluateNGonFaceGrids(CCGSubSurf *ss,
int x, S0 = 0, S1 = 0;
bool flip;
for (x = 0; x < face->numVerts; ++x) {
for (x = 0; x < face->numVerts; x++) {
if (all_verts[x] == edge->v0) {
S0 = x;
}
@@ -806,7 +806,7 @@ void ccgSubSurf_prepareTopologyRefiner(CCGSubSurf *ss, DerivedMesh *dm)
const MPoly *mpoly = dm->getPolyArray(dm);
int poly;
ss->numGrids = 0;
for (poly = 0; poly < num_polys; ++poly) {
for (poly = 0; poly < num_polys; poly++) {
ss->numGrids += mpoly[poly].totloop;
}
}
source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c
+7 -7
View File
@@ -172,7 +172,7 @@ static int conv_dm_get_num_edge_faces(const OpenSubdiv_Converter *converter, int
for (loop = 0; loop < mpoly->totloop; loop++) {
const MLoop *mloop = &storage->mloop[mpoly->loopstart + loop];
if (mloop->e == edge) {
++num;
num++;
break;
}
}
@@ -226,7 +226,7 @@ static int conv_dm_get_num_vert_edges(const OpenSubdiv_Converter *converter, int
for (edge = 0; edge < dm->getNumEdges(dm); edge++) {
const MEdge *medge = &user_data->medge[edge];
if (medge->v1 == vert || medge->v2 == vert) {
++num;
num++;
}
}
return num;
@@ -268,7 +268,7 @@ static int conv_dm_get_num_vert_faces(const OpenSubdiv_Converter *converter, int
for (loop = 0; loop < mpoly->totloop; loop++) {
const MLoop *mloop = &storage->mloop[mpoly->loopstart + loop];
if (mloop->v == vert) {
++num;
num++;
break;
}
}
@@ -357,23 +357,23 @@ static void conv_dm_precalc_uv_layer(const OpenSubdiv_Converter *converter, int
* The idea here is that we need to pass individual islands to OpenSubdiv.
*/
storage->num_uvs = 0;
for (int island = 0; island < storage->island_store.islands_num; ++island) {
for (int island = 0; island < storage->island_store.islands_num; island++) {
MeshElemMap *island_poly_map = storage->island_store.islands[island];
for (int poly = 0; poly < island_poly_map->count; ++poly) {
for (int poly = 0; poly < island_poly_map->count; poly++) {
int poly_index = island_poly_map->indices[poly];
/* Within the same UV island we should share UV points across
* loops. Otherwise each poly will be subdivided individually
* which we don't really want.
*/
const MPoly *mpoly = &storage->mpoly[poly_index];
for (int loop = 0; loop < mpoly->totloop; ++loop) {
for (int loop = 0; loop < mpoly->totloop; loop++) {
const MLoopUV *luv = &mloopuv[mpoly->loopstart + loop];
bool found = false;
/* TODO(sergey): Quite bad loop, which gives us O(N^2)
* complexity here. But how can we do it smarter, hopefully
* without requiring lots of additional memory.
*/
for (int i = 0; i < storage->num_uvs; ++i) {
for (int i = 0; i < storage->num_uvs; i++) {
if (equals_v2v2(luv->uv, &storage->uvs[2 * i])) {
storage->face_uvs[mpoly->loopstart + loop] = i;
found = true;
source/blender/blenkernel/intern/brush.c
+4 -4
View File
@@ -1504,8 +1504,8 @@ struct ImBuf *BKE_brush_gen_radial_control_imbuf(Brush *br, bool secondary)
im->rect_float = MEM_callocN(sizeof(float) * side * side, "radial control rect");
im->x = im->y = side;
for (i = 0; i < side; ++i) {
for (j = 0; j < side; ++j) {
for (i = 0; i < side; i++) {
for (j = 0; j < side; j++) {
float magn = sqrtf(pow2f(i - half) + pow2f(j - half));
im->rect_float[i * side + j] = BKE_brush_curve_strength_clamped(br, magn, half);
}
@@ -1513,8 +1513,8 @@ struct ImBuf *BKE_brush_gen_radial_control_imbuf(Brush *br, bool secondary)
/* Modulate curve with texture */
if (texcache) {
for (i = 0; i < side; ++i) {
for (j = 0; j < side; ++j) {
for (i = 0; i < side; i++) {
for (j = 0; j < side; j++) {
const int col = texcache[i * side + j];
im->rect_float[i * side + j] *= (((char *)&col)[0] + ((char *)&col)[1] +
((char *)&col)[2]) /
source/blender/blenkernel/intern/collision.c
+1 -1
View File
@@ -1742,7 +1742,7 @@ void cloth_free_contacts(ColliderContacts *collider_contacts, int totcolliders)
{
if (collider_contacts) {
int i;
for (i = 0; i < totcolliders; ++i) {
for (i = 0; i < totcolliders; i++) {
ColliderContacts *ct = collider_contacts + i;
if (ct->collisions) {
MEM_freeN(ct->collisions);
source/blender/blenkernel/intern/curve.c
+5 -5
View File
@@ -697,7 +697,7 @@ float BKE_nurb_calc_length(const Nurb *nu, int resolution)
a = nu->pntsu - 1;
bp = nu->bp;
if (nu->flagu & CU_NURB_CYCLIC) {
++a;
a++;
prevbp = nu->bp + (nu->pntsu - 1);
}
else {
@@ -708,7 +708,7 @@ float BKE_nurb_calc_length(const Nurb *nu, int resolution)
while (a--) {
length += len_v3v3(prevbp->vec, bp->vec);
prevbp = bp;
++bp;
bp++;
}
}
else if (nu->type == CU_BEZIER) {
@@ -716,12 +716,12 @@ float BKE_nurb_calc_length(const Nurb *nu, int resolution)
a = nu->pntsu - 1;
bezt = nu->bezt;
if (nu->flagu & CU_NURB_CYCLIC) {
++a;
a++;
prevbezt = nu->bezt + (nu->pntsu - 1);
}
else {
prevbezt = bezt;
++bezt;
bezt++;
}
while (a--) {
@@ -748,7 +748,7 @@ float BKE_nurb_calc_length(const Nurb *nu, int resolution)
}
}
prevbezt = bezt;
++bezt;
bezt++;
}
MEM_freeN(points);
source/blender/blenkernel/intern/customdata.c
+74 -74
View File
@@ -173,7 +173,7 @@ static void layerCopy_mdeformvert(const void *source, void *dest, int count)
memcpy(dest, source, count * size);
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
MDeformVert *dvert = POINTER_OFFSET(dest, i * size);
if (dvert->totweight) {
@@ -193,7 +193,7 @@ static void layerFree_mdeformvert(void *data, int count, int size)
{
int i;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
MDeformVert *dvert = POINTER_OFFSET(data, i * size);
if (dvert->dw) {
@@ -209,7 +209,7 @@ static void layerCopy_bmesh_elem_py_ptr(const void *UNUSED(source), void *dest,
{
int i, size = sizeof(void *);
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
void **ptr = POINTER_OFFSET(dest, i * size);
*ptr = NULL;
}
@@ -226,7 +226,7 @@ static void layerFree_bmesh_elem_py_ptr(void *data, int count, int size)
{
int i;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
void **ptr = POINTER_OFFSET(data, i * size);
if (*ptr) {
bpy_bm_generic_invalidate(*ptr);
@@ -258,11 +258,11 @@ static void layerInterp_mdeformvert(const void **sources,
/* build a list of unique def_nrs for dest */
totweight = 0;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
const MDeformVert *source = sources[i];
float interp_weight = weights ? weights[i] : 1.0f;
for (j = 0; j < source->totweight; ++j) {
for (j = 0; j < source->totweight; j++) {
MDeformWeight *dw = &source->dw[j];
float weight = dw->weight * interp_weight;
@@ -407,7 +407,7 @@ static void layerCopy_tface(const void *source, void *dest, int count)
MTFace *dest_tf = (MTFace *)dest;
int i;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
dest_tf[i] = source_tf[i];
}
}
@@ -425,13 +425,13 @@ static void layerInterp_tface(
}
sub_weight = sub_weights;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
float weight = weights ? weights[i] : 1;
const MTFace *src = sources[i];
for (j = 0; j < 4; ++j) {
for (j = 0; j < 4; j++) {
if (sub_weights) {
for (k = 0; k < 4; ++k, ++sub_weight) {
for (k = 0; k < 4; k++, sub_weight++) {
madd_v2_v2fl(uv[j], src->uv[k], (*sub_weight) * weight);
}
}
@@ -452,7 +452,7 @@ static void layerSwap_tface(void *data, const int *corner_indices)
float uv[4][2];
int j;
for (j = 0; j < 4; ++j) {
for (j = 0; j < 4; j++) {
const int source_index = corner_indices[j];
copy_v2_v2(uv[j], tf->uv[source_index]);
}
@@ -514,7 +514,7 @@ static void layerCopy_origspace_face(const void *source, void *dest, int count)
OrigSpaceFace *dest_tf = (OrigSpaceFace *)dest;
int i;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
dest_tf[i] = source_tf[i];
}
}
@@ -532,13 +532,13 @@ static void layerInterp_origspace_face(
}
sub_weight = sub_weights;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
float weight = weights ? weights[i] : 1;
const OrigSpaceFace *src = sources[i];
for (j = 0; j < 4; ++j) {
for (j = 0; j < 4; j++) {
if (sub_weights) {
for (k = 0; k < 4; ++k, ++sub_weight) {
for (k = 0; k < 4; k++, sub_weight++) {
madd_v2_v2fl(uv[j], src->uv[k], (*sub_weight) * weight);
}
}
@@ -558,7 +558,7 @@ static void layerSwap_origspace_face(void *data, const int *corner_indices)
float uv[4][2];
int j;
for (j = 0; j < 4; ++j) {
for (j = 0; j < 4; j++) {
copy_v2_v2(uv[j], osf->uv[corner_indices[j]]);
}
memcpy(osf->uv, uv, sizeof(osf->uv));
@@ -613,7 +613,7 @@ static void layerCopy_mdisps(const void *source, void *dest, int count)
const MDisps *s = source;
MDisps *d = dest;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
if (s[i].disps) {
d[i].disps = MEM_dupallocN(s[i].disps);
d[i].hidden = MEM_dupallocN(s[i].hidden);
@@ -634,7 +634,7 @@ static void layerFree_mdisps(void *data, int count, int UNUSED(size))
int i;
MDisps *d = data;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
if (d[i].disps) {
MEM_freeN(d[i].disps);
}
@@ -653,7 +653,7 @@ static int layerRead_mdisps(CDataFile *cdf, void *data, int count)
MDisps *d = data;
int i;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
if (!d[i].disps) {
d[i].disps = MEM_calloc_arrayN(d[i].totdisp, 3 * sizeof(float), "mdisps read");
}
@@ -672,7 +672,7 @@ static int layerWrite_mdisps(CDataFile *cdf, const void *data, int count)
const MDisps *d = data;
int i;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
if (!cdf_write_data(cdf, d[i].totdisp * 3 * sizeof(float), d[i].disps)) {
CLOG_ERROR(&LOG, "failed to write multires displacement %d/%d %d", i, count, d[i].totdisp);
return 0;
@@ -688,7 +688,7 @@ static size_t layerFilesize_mdisps(CDataFile *UNUSED(cdf), const void *data, int
size_t size = 0;
int i;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
size += d[i].totdisp * 3 * sizeof(float);
}
@@ -701,7 +701,7 @@ static void layerCopy_grid_paint_mask(const void *source, void *dest, int count)
const GridPaintMask *s = source;
GridPaintMask *d = dest;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
if (s[i].data) {
d[i].data = MEM_dupallocN(s[i].data);
d[i].level = s[i].level;
@@ -718,7 +718,7 @@ static void layerFree_grid_paint_mask(void *data, int count, int UNUSED(size))
int i;
GridPaintMask *gpm = data;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
if (gpm[i].data) {
MEM_freeN(gpm[i].data);
}
@@ -887,7 +887,7 @@ static void layerInterp_mloopcol(
} col = {0};
const float *sub_weight = sub_weights;
for (int i = 0; i < count; ++i) {
for (int i = 0; i < count; i++) {
float weight = weights ? weights[i] : 1;
const MLoopCol *src = sources[i];
if (sub_weights) {
@@ -1128,13 +1128,13 @@ static void layerInterp_mcol(
}
sub_weight = sub_weights;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
float weight = weights ? weights[i] : 1;
for (j = 0; j < 4; ++j) {
for (j = 0; j < 4; j++) {
if (sub_weights) {
const MCol *src = sources[i];
for (k = 0; k < 4; ++k, ++sub_weight, ++src) {
for (k = 0; k < 4; k++, sub_weight++, src++) {
const float w = (*sub_weight) * weight;
col[j].a += src->a * w;
col[j].r += src->r * w;
@@ -1153,7 +1153,7 @@ static void layerInterp_mcol(
}
/* Delay writing to the destination in case dest is in sources. */
for (j = 0; j < 4; ++j) {
for (j = 0; j < 4; j++) {
/* Subdivide smooth or fractal can cause problems without clamping
* although weights should also not cause this situation */
@@ -1170,7 +1170,7 @@ static void layerSwap_mcol(void *data, const int *corner_indices)
MCol col[4];
int j;
for (j = 0; j < 4; ++j) {
for (j = 0; j < 4; j++) {
col[j] = mcol[corner_indices[j]];
}
@@ -1210,12 +1210,12 @@ static void layerInterp_bweight(const void **sources,
f = 0.0f;
if (weights) {
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
f += *in[i] * weights[i];
}
}
else {
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
f += *in[i];
}
}
@@ -1241,12 +1241,12 @@ static void layerInterp_shapekey(const void **sources,
zero_v3(co);
if (weights) {
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
madd_v3_v3fl(co, in[i], weights[i]);
}
}
else {
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
add_v3_v3(co, in[i]);
}
}
@@ -1862,7 +1862,7 @@ bool CustomData_merge(const struct CustomData *source,
int number = 0, maxnumber = -1;
bool changed = false;
for (i = 0; i < source->totlayer; ++i) {
for (i = 0; i < source->totlayer; i++) {
layer = &source->layers[i];
/*typeInfo = layerType_getInfo(layer->type);*/ /*UNUSED*/
@@ -1934,7 +1934,7 @@ bool CustomData_merge(const struct CustomData *source,
void CustomData_realloc(CustomData *data, int totelem)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
CustomDataLayer *layer = &data->layers[i];
const LayerTypeInfo *typeInfo;
if (layer->flag & CD_FLAG_NOFREE) {
@@ -1995,7 +1995,7 @@ void CustomData_free(CustomData *data, int totelem)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
customData_free_layer__internal(&data->layers[i], totelem);
}
@@ -2011,7 +2011,7 @@ void CustomData_free_typemask(struct CustomData *data, int totelem, CustomDataMa
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
CustomDataLayer *layer = &data->layers[i];
if (!(mask & CD_TYPE_AS_MASK(layer->type))) {
continue;
@@ -2032,7 +2032,7 @@ static void customData_update_offsets(CustomData *data)
const LayerTypeInfo *typeInfo;
int i, offset = 0;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
typeInfo = layerType_getInfo(data->layers[i].type);
data->layers[i].offset = offset;
@@ -2048,7 +2048,7 @@ static int CustomData_get_layer_index__notypemap(const CustomData *data, int typ
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
return i;
}
@@ -2082,7 +2082,7 @@ int CustomData_get_named_layer_index(const CustomData *data, int type, const cha
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
if (STREQ(data->layers[i].name, name)) {
return i;
@@ -2164,7 +2164,7 @@ void CustomData_set_layer_active(CustomData *data, int type, int n)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].active = n;
}
@@ -2175,7 +2175,7 @@ void CustomData_set_layer_render(CustomData *data, int type, int n)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].active_rnd = n;
}
@@ -2186,7 +2186,7 @@ void CustomData_set_layer_clone(CustomData *data, int type, int n)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].active_clone = n;
}
@@ -2197,7 +2197,7 @@ void CustomData_set_layer_stencil(CustomData *data, int type, int n)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].active_mask = n;
}
@@ -2210,7 +2210,7 @@ void CustomData_set_layer_active_index(CustomData *data, int type, int n)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].active = n - i;
}
@@ -2221,7 +2221,7 @@ void CustomData_set_layer_render_index(CustomData *data, int type, int n)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].active_rnd = n - i;
}
@@ -2232,7 +2232,7 @@ void CustomData_set_layer_clone_index(CustomData *data, int type, int n)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].active_clone = n - i;
}
@@ -2243,7 +2243,7 @@ void CustomData_set_layer_stencil_index(CustomData *data, int type, int n)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].active_mask = n - i;
}
@@ -2254,7 +2254,7 @@ void CustomData_set_layer_flag(struct CustomData *data, int type, int flag)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].flag |= flag;
}
@@ -2265,7 +2265,7 @@ void CustomData_clear_layer_flag(struct CustomData *data, int type, int flag)
{
const int nflag = ~flag;
for (int i = 0; i < data->totlayer; ++i) {
for (int i = 0; i < data->totlayer; i++) {
if (data->layers[i].type == type) {
data->layers[i].flag &= nflag;
}
@@ -2355,7 +2355,7 @@ static CustomDataLayer *customData_add_layer__internal(CustomData *data,
data->totlayer++;
/* keep layers ordered by type */
for (; index > 0 && data->layers[index - 1].type > type; --index) {
for (; index > 0 && data->layers[index - 1].type > type; index--) {
data->layers[index] = data->layers[index - 1];
}
@@ -2447,7 +2447,7 @@ bool CustomData_free_layer(CustomData *data, int type, int totelem, int index)
customData_free_layer__internal(&data->layers[index], totelem);
for (i = index + 1; i < data->totlayer; ++i) {
for (i = index + 1; i < data->totlayer; i++) {
data->layers[i - 1] = data->layers[i];
}
@@ -2628,7 +2628,7 @@ void CustomData_free_temporary(CustomData *data, int totelem)
int i, j;
bool changed = false;
for (i = 0, j = 0; i < data->totlayer; ++i) {
for (i = 0, j = 0; i < data->totlayer; i++) {
layer = &data->layers[i];
if (i != j) {
@@ -2660,7 +2660,7 @@ void CustomData_set_only_copy(const struct CustomData *data, CustomDataMask mask
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (!(mask & CD_TYPE_AS_MASK(data->layers[i].type))) {
data->layers[i].flag |= CD_FLAG_NOCOPY;
}
@@ -2725,7 +2725,7 @@ void CustomData_copy_data_named(
int src_i, dest_i;
/* copies a layer at a time */
for (src_i = 0; src_i < source->totlayer; ++src_i) {
for (src_i = 0; src_i < source->totlayer; src_i++) {
dest_i = CustomData_get_named_layer_index(
dest, source->layers[src_i].type, source->layers[src_i].name);
@@ -2744,7 +2744,7 @@ void CustomData_copy_data(
/* copies a layer at a time */
dest_i = 0;
for (src_i = 0; src_i < source->totlayer; ++src_i) {
for (src_i = 0; src_i < source->totlayer; src_i++) {
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
@@ -2800,7 +2800,7 @@ void CustomData_free_elem(CustomData *data, int index, int count)
int i;
const LayerTypeInfo *typeInfo;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (!(data->layers[i].flag & CD_FLAG_NOFREE)) {
typeInfo = layerType_getInfo(data->layers[i].type);
@@ -2835,7 +2835,7 @@ void CustomData_interp(const CustomData *source,
/* interpolates a layer at a time */
dest_i = 0;
for (src_i = 0; src_i < source->totlayer; ++src_i) {
for (src_i = 0; src_i < source->totlayer; src_i++) {
const LayerTypeInfo *typeInfo = layerType_getInfo(source->layers[src_i].type);
if (!typeInfo->interp) {
continue;
@@ -2857,7 +2857,7 @@ void CustomData_interp(const CustomData *source,
if (dest->layers[dest_i].type == source->layers[src_i].type) {
void *src_data = source->layers[src_i].data;
for (j = 0; j < count; ++j) {
for (j = 0; j < count; j++) {
sources[j] = POINTER_OFFSET(src_data, (size_t)src_indices[j] * typeInfo->size);
}
@@ -2893,7 +2893,7 @@ void CustomData_swap_corners(struct CustomData *data, int index, const int *corn
const LayerTypeInfo *typeInfo;
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
typeInfo = layerType_getInfo(data->layers[i].type);
if (typeInfo->swap) {
@@ -2916,7 +2916,7 @@ void CustomData_swap(struct CustomData *data, const int index_a, const int index
return;
}
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
const LayerTypeInfo *typeInfo = layerType_getInfo(data->layers[i].type);
const size_t size = typeInfo->size;
const size_t offset_a = size * index_a;
@@ -3392,7 +3392,7 @@ void CustomData_bmesh_free_block(CustomData *data, void **block)
return;
}
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (!(data->layers[i].flag & CD_FLAG_NOFREE)) {
typeInfo = layerType_getInfo(data->layers[i].type);
@@ -3422,7 +3422,7 @@ void CustomData_bmesh_free_block_data(CustomData *data, void *block)
return;
}
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (!(data->layers[i].flag & CD_FLAG_NOFREE)) {
typeInfo = layerType_getInfo(data->layers[i].type);
@@ -3476,7 +3476,7 @@ void CustomData_bmesh_set_default(CustomData *data, void **block)
CustomData_bmesh_alloc_block(data, block);
}
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
CustomData_bmesh_set_default_n(data, block, i);
}
}
@@ -3498,7 +3498,7 @@ void CustomData_bmesh_copy_data(const CustomData *source,
/* copies a layer at a time */
dest_i = 0;
for (src_i = 0; src_i < source->totlayer; ++src_i) {
for (src_i = 0; src_i < source->totlayer; src_i++) {
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
@@ -3609,7 +3609,7 @@ bool CustomData_has_math(const struct CustomData *data)
int i;
/* interpolates a layer at a time */
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (CustomData_layer_has_math(data, i)) {
return true;
}
@@ -3624,7 +3624,7 @@ bool CustomData_bmesh_has_free(const struct CustomData *data)
const LayerTypeInfo *typeInfo;
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (!(data->layers[i].flag & CD_FLAG_NOFREE)) {
typeInfo = layerType_getInfo(data->layers[i].type);
if (typeInfo->free) {
@@ -3640,7 +3640,7 @@ bool CustomData_has_interp(const struct CustomData *data)
int i;
/* interpolates a layer at a time */
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (CustomData_layer_has_interp(data, i)) {
return true;
}
@@ -3652,7 +3652,7 @@ bool CustomData_has_interp(const struct CustomData *data)
bool CustomData_has_referenced(const struct CustomData *data)
{
int i;
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
if (data->layers[i].flag & CD_FLAG_NOFREE) {
return true;
}
@@ -3832,11 +3832,11 @@ void CustomData_bmesh_interp(CustomData *data,
}
/* interpolates a layer at a time */
for (i = 0; i < data->totlayer; ++i) {
for (i = 0; i < data->totlayer; i++) {
CustomDataLayer *layer = &data->layers[i];
const LayerTypeInfo *typeInfo = layerType_getInfo(layer->type);
if (typeInfo->interp) {
for (j = 0; j < count; ++j) {
for (j = 0; j < count; j++) {
sources[j] = POINTER_OFFSET(src_blocks[j], layer->offset);
}
CustomData_bmesh_interp_n(
@@ -3869,7 +3869,7 @@ void CustomData_to_bmesh_block(const CustomData *source,
/* copies a layer at a time */
dest_i = 0;
for (src_i = 0; src_i < source->totlayer; ++src_i) {
for (src_i = 0; src_i < source->totlayer; src_i++) {
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
@@ -3927,7 +3927,7 @@ void CustomData_from_bmesh_block(const CustomData *source,
/* copies a layer at a time */
dest_i = 0;
for (src_i = 0; src_i < source->totlayer; ++src_i) {
for (src_i = 0; src_i < source->totlayer; src_i++) {
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
@@ -4198,7 +4198,7 @@ bool CustomData_verify_versions(struct CustomData *data, int index)
}
if (!keeplayer) {
for (i = index + 1; i < data->totlayer; ++i) {
for (i = index + 1; i < data->totlayer; i++) {
data->layers[i - 1] = data->layers[i];
}
data->totlayer--;
source/blender/blenkernel/intern/icons.c
+5 -5
View File
@@ -224,7 +224,7 @@ static PreviewImage *previewimg_create_ex(size_t deferred_data_size)
prv_img->tag |= PRV_TAG_DEFFERED;
}
for (i = 0; i < NUM_ICON_SIZES; ++i) {
for (i = 0; i < NUM_ICON_SIZES; i++) {
prv_img->flag[i] |= PRV_CHANGED;
prv_img->changed_timestamp[i] = 0;
}
@@ -242,7 +242,7 @@ void BKE_previewimg_freefunc(void *link)
if (prv) {
int i;
for (i = 0; i < NUM_ICON_SIZES; ++i) {
for (i = 0; i < NUM_ICON_SIZES; i++) {
if (prv->rect[i]) {
MEM_freeN(prv->rect[i]);
}
@@ -278,7 +278,7 @@ void BKE_previewimg_clear_single(struct PreviewImage *prv, enum eIconSizes size)
void BKE_previewimg_clear(struct PreviewImage *prv)
{
int i;
for (i = 0; i < NUM_ICON_SIZES; ++i) {
for (i = 0; i < NUM_ICON_SIZES; i++) {
BKE_previewimg_clear_single(prv, i);
}
}
@@ -290,7 +290,7 @@ PreviewImage *BKE_previewimg_copy(const PreviewImage *prv)
if (prv) {
prv_img = MEM_dupallocN(prv);
for (i = 0; i < NUM_ICON_SIZES; ++i) {
for (i = 0; i < NUM_ICON_SIZES; i++) {
if (prv->rect[i]) {
prv_img->rect[i] = MEM_dupallocN(prv->rect[i]);
}
@@ -545,7 +545,7 @@ void BKE_icon_changed(const int icon_id)
/* If we have previews, they all are now invalid changed. */
if (p_prv && *p_prv) {
int i;
for (i = 0; i < NUM_ICON_SIZES; ++i) {
for (i = 0; i < NUM_ICON_SIZES; i++) {
(*p_prv)->flag[i] |= PRV_CHANGED;
(*p_prv)->changed_timestamp[i]++;
}
source/blender/blenkernel/intern/multires.c
+49 -49
View File
@@ -452,7 +452,7 @@ static int get_levels_from_disps(Object *ob)
mdisp = CustomData_get_layer(&me->ldata, CD_MDISPS);
for (i = 0; i < me->totpoly; ++i) {
for (i = 0; i < me->totpoly; i++) {
md = mdisp + me->mpoly[i].loopstart;
for (j = 0; j < me->mpoly[i].totloop; j++, md++) {
@@ -520,7 +520,7 @@ static void multires_reallocate_mdisps(int totloop, MDisps *mdisps, int lvl)
int i;
/* reallocate displacements to be filled in */
for (i = 0; i < totloop; ++i) {
for (i = 0; i < totloop; i++) {
int totdisp = multires_grid_tot[lvl];
float(*disps)[3] = MEM_calloc_arrayN(totdisp, 3 * sizeof(float), "multires disps");
@@ -633,7 +633,7 @@ static void multires_del_higher(MultiresModifierData *mmd, Object *ob, int lvl)
int hsize = multires_side_tot[mmd->totlvl];
int i, j;
for (i = 0; i < me->totpoly; ++i) {
for (i = 0; i < me->totpoly; i++) {
for (j = 0; j < me->mpoly[i].totloop; j++) {
int g = me->mpoly[i].loopstart + j;
MDisps *mdisp = &mdisps[g];
@@ -802,7 +802,7 @@ void multiresModifier_base_apply(MultiresModifierData *mmd, Scene *scene, Object
/* copy the new locations of the base verts into the mesh */
offset = dispdm->getNumVerts(dispdm) - me->totvert;
for (i = 0; i < me->totvert; ++i) {
for (i = 0; i < me->totvert; i++) {
dispdm->getVertCo(dispdm, offset + i, me->mvert[i].co);
}
@@ -811,11 +811,11 @@ void multiresModifier_base_apply(MultiresModifierData *mmd, Scene *scene, Object
cddm = CDDM_from_mesh(me);
pmap = cddm->getPolyMap(ob, cddm);
origco = MEM_calloc_arrayN(me->totvert, 3 * sizeof(float), "multires apply base origco");
for (i = 0; i < me->totvert; ++i) {
for (i = 0; i < me->totvert; i++) {
copy_v3_v3(origco[i], me->mvert[i].co);
}
for (i = 0; i < me->totvert; ++i) {
for (i = 0; i < me->totvert; i++) {
float avg_no[3] = {0, 0, 0}, center[3] = {0, 0, 0}, push[3];
float dist;
int tot = 0;
@@ -830,7 +830,7 @@ void multiresModifier_base_apply(MultiresModifierData *mmd, Scene *scene, Object
const MPoly *p = &me->mpoly[pmap[i].indices[j]];
/* this double counts, not sure if that's bad or good */
for (k = 0; k < p->totloop; ++k) {
for (k = 0; k < p->totloop; k++) {
int vndx = me->mloop[p->loopstart + k].v;
if (vndx != i) {
add_v3_v3(center, origco[vndx]);
@@ -855,7 +855,7 @@ void multiresModifier_base_apply(MultiresModifierData *mmd, Scene *scene, Object
fake_loops = MEM_malloc_arrayN(p->totloop, sizeof(MLoop), "fake_loops");
fake_co = MEM_malloc_arrayN(p->totloop, 3 * sizeof(float), "fake_co");
for (k = 0; k < p->totloop; ++k) {
for (k = 0; k < p->totloop; k++) {
int vndx = me->mloop[p->loopstart + k].v;
fake_loops[k].v = k;
@@ -975,7 +975,7 @@ static void multires_subdivide(
subGridData = MEM_calloc_arrayN(numGrids, sizeof(float *), "subGridData*");
for (i = 0; i < numGrids; ++i) {
for (i = 0; i < numGrids; i++) {
/* backup subsurf grids */
subGridData[i] = MEM_calloc_arrayN(
highGridKey.elem_size, highGridSize * highGridSize, "subGridData");
@@ -1000,7 +1000,7 @@ static void multires_subdivide(
/* free */
highdm->release(highdm);
for (i = 0; i < numGrids; ++i) {
for (i = 0; i < numGrids; i++) {
MEM_freeN(subGridData[i]);
}
MEM_freeN(subGridData);
@@ -1097,7 +1097,7 @@ static void multires_disp_run_cb(void *__restrict userdata,
const int numVerts = mpoly[pidx].totloop;
int S, x, y, gIndex = gridOffset[pidx];
for (S = 0; S < numVerts; ++S, ++gIndex) {
for (S = 0; S < numVerts; S++, gIndex++) {
GridPaintMask *gpm = grid_paint_mask ? &grid_paint_mask[gIndex] : NULL;
MDisps *mdisp = &mdisps[mpoly[pidx].loopstart + S];
CCGElem *grid = gridData[gIndex];
@@ -1223,7 +1223,7 @@ static void multiresModifier_disp_run(
}
/* when adding new faces in edit mode, need to allocate disps */
for (i = 0; i < totloop; ++i) {
for (i = 0; i < totloop; i++) {
if (mdisps[i].disps == NULL) {
multires_reallocate_mdisps(totloop, mdisps, totlvl);
break;
@@ -1324,7 +1324,7 @@ void multires_modifier_update_mdisps(struct DerivedMesh *dm, Scene *scene)
subGridData = MEM_calloc_arrayN(numGrids, sizeof(CCGElem *), "subGridData*");
diffGrid = MEM_calloc_arrayN(lowGridKey.elem_size, lowGridSize * lowGridSize, "diff");
for (i = 0; i < numGrids; ++i) {
for (i = 0; i < numGrids; i++) {
/* backup subsurf grids */
subGridData[i] = MEM_calloc_arrayN(
highGridKey.elem_size, highGridSize * highGridSize, "subGridData");
@@ -1332,7 +1332,7 @@ void multires_modifier_update_mdisps(struct DerivedMesh *dm, Scene *scene)
subGridData[i], highGridData[i], highGridKey.elem_size * highGridSize * highGridSize);
/* write difference of subsurf and displaced low level into high subsurf */
for (j = 0; j < lowGridSize * lowGridSize; ++j) {
for (j = 0; j < lowGridSize * lowGridSize; j++) {
sub_v4_v4v4(CCG_elem_offset_co(&lowGridKey, diffGrid, j),
CCG_elem_offset_co(&lowGridKey, gridData[i], j),
CCG_elem_offset_co(&lowGridKey, lowGridData[i], j));
@@ -1354,7 +1354,7 @@ void multires_modifier_update_mdisps(struct DerivedMesh *dm, Scene *scene)
/* free */
highdm->release(highdm);
for (i = 0; i < numGrids; ++i) {
for (i = 0; i < numGrids; i++) {
MEM_freeN(subGridData[i]);
}
MEM_freeN(subGridData);
@@ -1617,8 +1617,8 @@ static void old_mdisps_convert(MFace *mface, MDisps *mdisp)
out = disps;
for (S = 0; S < nvert; S++) {
for (y = 0; y < newside; ++y) {
for (x = 0; x < newside; ++x, ++out) {
for (y = 0; y < newside; y++) {
for (x = 0; x < newside; x++, out++) {
old_mdisps_rotate(S, newside, oldside, x, y, &u, &v);
old_mdisps_bilinear(*out, mdisp->disps, oldside, u, v);
@@ -1749,8 +1749,8 @@ static void create_old_vert_face_map(ListBase **map,
node = *mem;
/* Find the users */
for (i = 0; i < totface; ++i) {
for (j = 0; j < (mface[i].v[3] ? 4 : 3); ++j, ++node) {
for (i = 0; i < totface; i++) {
for (j = 0; j < (mface[i].v[3] ? 4 : 3); j++, node++) {
node->index = i;
BLI_addtail(&(*map)[mface[i].v[j]], node);
}
@@ -1771,8 +1771,8 @@ static void create_old_vert_edge_map(ListBase **map,
node = *mem;
/* Find the users */
for (i = 0; i < totedge; ++i) {
for (j = 0; j < 2; ++j, ++node) {
for (i = 0; i < totedge; i++) {
for (j = 0; j < 2; j++, node++) {
node->index = i;
BLI_addtail(&(*map)[medge[i].v[j]], node);
}
@@ -1793,8 +1793,8 @@ static MultiresFace *find_old_face(
for (n1 = map[v1].first; n1; n1 = n1->next) {
int fnd[4] = {0, 0, 0, 0};
for (i = 0; i < 4; ++i) {
for (j = 0; j < 4; ++j) {
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
if (v[i] == faces[n1->index].v[j]) {
fnd[i] = 1;
}
@@ -2006,24 +2006,24 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
lvl1 = mr->levels.first;
/* Load base verts */
for (i = 0; i < lvl1->totvert; ++i) {
for (i = 0; i < lvl1->totvert; i++) {
vvmap[totvert - lvl1->totvert + i] = src;
src++;
}
/* Original edges */
dst = totvert - lvl1->totvert - extedgelen * lvl1->totedge;
for (i = 0; i < lvl1->totedge; ++i) {
for (i = 0; i < lvl1->totedge; i++) {
int ldst = dst + extedgelen * i;
int lsrc = src;
lvl = lvl1->next;
for (j = 2; j <= mr->level_count; ++j) {
for (j = 2; j <= mr->level_count; j++) {
int base = multires_side_tot[totlvl - j + 1] - 2;
int skip = multires_side_tot[totlvl - j + 2] - 1;
int st = multires_side_tot[j - 1] - 1;
for (x = 0; x < st; ++x) {
for (x = 0; x < st; x++) {
vvmap[ldst + base + x * skip] = lsrc + st * i + x;
}
@@ -2034,7 +2034,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
/* Center points */
dst = 0;
for (i = 0; i < lvl1->totface; ++i) {
for (i = 0; i < lvl1->totface; i++) {
int sides = lvl1->faces[i].v[3] ? 4 : 3;
vvmap[dst] = src + lvl1->totedge + i;
@@ -2050,13 +2050,13 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
tottri = totquad = 0;
crossedgelen = multires_side_tot[totlvl - 1] - 2;
dst = 0;
for (i = 0; i < lvl1->totface; ++i) {
for (i = 0; i < lvl1->totface; i++) {
int sides = lvl1->faces[i].v[3] ? 4 : 3;
lvl = lvl1->next->next;
dst++;
for (j = 3; j <= mr->level_count; ++j) {
for (j = 3; j <= mr->level_count; j++) {
int base = multires_side_tot[totlvl - j + 1] - 2;
int skip = multires_side_tot[totlvl - j + 2] - 1;
int st = pow(2, j - 2);
@@ -2069,8 +2069,8 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
/* Skip earlier face edge crosses */
lsrc += st2 * (tottri * 3 + totquad * 4);
for (s = 0; s < sides; ++s) {
for (x = 0; x < st2; ++x) {
for (s = 0; s < sides; s++) {
for (x = 0; x < st2; x++) {
vvmap[dst + crossedgelen * (s + 1) - base - x * skip - 1] = lsrc;
lsrc++;
}
@@ -2082,10 +2082,10 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
dst += sides * (st_last - 1) * st_last;
if (sides == 4) {
++totquad;
totquad++;
}
else {
++tottri;
tottri++;
}
}
@@ -2095,7 +2095,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
fmem = MEM_calloc_arrayN((mr->level_count - 1), sizeof(IndexNode *), "multires fmem");
emem = MEM_calloc_arrayN((mr->level_count - 1), sizeof(IndexNode *), "multires emem");
lvl = lvl1;
for (i = 0; i < (unsigned int)mr->level_count - 1; ++i) {
for (i = 0; i < (unsigned int)mr->level_count - 1; i++) {
create_old_vert_face_map(fmap + i, fmem + i, lvl->faces, lvl->totvert, lvl->totface);
create_old_vert_edge_map(emap + i, emem + i, lvl->edges, lvl->totvert, lvl->totedge);
lvl = lvl->next;
@@ -2104,11 +2104,11 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
/* Interior face verts */
/* lvl = lvl1->next->next; */ /* UNUSED */
dst = 0;
for (j = 0; j < lvl1->totface; ++j) {
for (j = 0; j < lvl1->totface; j++) {
int sides = lvl1->faces[j].v[3] ? 4 : 3;
int ldst = dst + 1 + sides * (st_last - 1);
for (s = 0; s < sides; ++s) {
for (s = 0; s < sides; s++) {
int st2 = multires_side_tot[totlvl - 1] - 2;
int st3 = multires_side_tot[totlvl - 2] - 2;
int st4 = st3 == 0 ? 1 : (st3 + 1) / 2;
@@ -2137,7 +2137,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
/*lvl = lvl->next;*/ /*UNUSED*/
for (i = 0; i < (unsigned int)(mr->level_count - 1); ++i) {
for (i = 0; i < (unsigned int)(mr->level_count - 1); i++) {
MEM_freeN(fmap[i]);
MEM_freeN(fmem[i]);
MEM_freeN(emap[i]);
@@ -2151,7 +2151,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
}
/* Transfer verts */
for (i = 0; i < totvert; ++i) {
for (i = 0; i < totvert; i++) {
copy_v3_v3(vdst[i].co, vsrc[vvmap[i]].co);
}
@@ -2183,8 +2183,8 @@ static void multires_load_old_vcols(Mesh *me)
return;
}
for (i = 0; i < me->totface; ++i) {
for (j = 0; j < 4; ++j) {
for (i = 0; i < me->totface; i++) {
for (j = 0; j < 4; j++) {
mcol[i * 4 + j].a = colface[i].col[j].a;
mcol[i * 4 + j].r = colface[i].col[j].r;
mcol[i * 4 + j].g = colface[i].col[j].g;
@@ -2208,7 +2208,7 @@ static void multires_load_old_face_flags(Mesh *me)
return;
}
for (i = 0; i < me->totface; ++i) {
for (i = 0; i < me->totface; i++) {
me->mface[i].flag = faces[i].flag;
}
}
@@ -2234,11 +2234,11 @@ void multires_load_old(Object *ob, Mesh *me)
me->medge = CustomData_add_layer(&me->edata, CD_MEDGE, CD_CALLOC, NULL, me->totedge);
me->mface = CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface);
memcpy(me->mvert, me->mr->verts, sizeof(MVert) * me->totvert);
for (i = 0; i < me->totedge; ++i) {
for (i = 0; i < me->totedge; i++) {
me->medge[i].v1 = lvl->edges[i].v[0];
me->medge[i].v2 = lvl->edges[i].v[1];
}
for (i = 0; i < me->totface; ++i) {
for (i = 0; i < me->totface; i++) {
me->mface[i].v1 = lvl->faces[i].v[0];
me->mface[i].v2 = lvl->faces[i].v[1];
me->mface[i].v3 = lvl->faces[i].v[2];
@@ -2248,10 +2248,10 @@ void multires_load_old(Object *ob, Mesh *me)
/* Copy the first-level data to the mesh */
/* XXX We must do this before converting tessfaces to polys/lopps! */
for (i = 0, l = me->mr->vdata.layers; i < me->mr->vdata.totlayer; ++i, ++l) {
for (i = 0, l = me->mr->vdata.layers; i < me->mr->vdata.totlayer; i++, l++) {
CustomData_add_layer(&me->vdata, l->type, CD_REFERENCE, l->data, me->totvert);
}
for (i = 0, l = me->mr->fdata.layers; i < me->mr->fdata.totlayer; ++i, ++l) {
for (i = 0, l = me->mr->fdata.layers; i < me->mr->fdata.totlayer; i++, l++) {
CustomData_add_layer(&me->fdata, l->type, CD_REFERENCE, l->data, me->totface);
}
CustomData_reset(&me->mr->vdata);
@@ -2271,7 +2271,7 @@ void multires_load_old(Object *ob, Mesh *me)
mmd = (MultiresModifierData *)modifier_new(eModifierType_Multires);
BLI_insertlinkbefore(&ob->modifiers, md, mmd);
for (i = 0; i < me->mr->level_count - 1; ++i) {
for (i = 0; i < me->mr->level_count - 1; i++) {
multiresModifier_subdivide(mmd, NULL, ob, 1, 0);
}
@@ -2337,9 +2337,9 @@ static void multires_apply_uniform_scale(Object *object, const float scale)
{
Mesh *mesh = (Mesh *)object->data;
MDisps *mdisps = CustomData_get_layer(&mesh->ldata, CD_MDISPS);
for (int i = 0; i < mesh->totloop; ++i) {
for (int i = 0; i < mesh->totloop; i++) {
MDisps *grid = &mdisps[i];
for (int j = 0; j < grid->totdisp; ++j) {
for (int j = 0; j < grid->totdisp; j++) {
mul_v3_fl(grid->disps[j], scale);
}
}
source/blender/blenkernel/intern/multires_reshape.c
+1 -1
View File
@@ -650,7 +650,7 @@ static void multires_reshape_neighour_boundary_vertices(MultiresReshapeContext *
const int start_ptex_face_index = ctx->face_ptex_offset[coarse_poly_index];
const bool is_quad = (coarse_poly->totloop == 4);
if (corner_u == 1.0f && corner_v == 1.0f) {
for (int current_corner = 0; current_corner < num_corners; ++current_corner) {
for (int current_corner = 0; current_corner < num_corners; current_corner++) {
if (current_corner == coarse_corner) {
continue;
}
source/blender/blenkernel/intern/node.c
+6 -6
View File
@@ -3146,7 +3146,7 @@ void BKE_node_instance_hash_remove_untagged(bNodeInstanceHash *hash,
}
}
for (i = 0; i < num_untagged; ++i) {
for (i = 0; i < num_untagged; i++) {
BKE_node_instance_hash_remove(hash, untagged[i], valfreefp);
}
@@ -3571,7 +3571,7 @@ static bool unique_socket_template_identifier_check(void *arg, const char *name)
bNodeSocketTemplate *ntemp;
} *data = arg;
for (ntemp = data->list; ntemp->type >= 0; ++ntemp) {
for (ntemp = data->list; ntemp->type >= 0; ntemp++) {
if (ntemp != data->ntemp) {
if (STREQ(ntemp->identifier, name)) {
return true;
@@ -3614,22 +3614,22 @@ void node_type_socket_templates(struct bNodeType *ntype,
/* automatically generate unique identifiers */
if (inputs) {
/* clear identifier strings (uninitialized memory) */
for (ntemp = inputs; ntemp->type >= 0; ++ntemp) {
for (ntemp = inputs; ntemp->type >= 0; ntemp++) {
ntemp->identifier[0] = '\0';
}
for (ntemp = inputs; ntemp->type >= 0; ++ntemp) {
for (ntemp = inputs; ntemp->type >= 0; ntemp++) {
BLI_strncpy(ntemp->identifier, ntemp->name, sizeof(ntemp->identifier));
unique_socket_template_identifier(inputs, ntemp, ntemp->identifier, '_');
}
}
if (outputs) {
/* clear identifier strings (uninitialized memory) */
for (ntemp = outputs; ntemp->type >= 0; ++ntemp) {
for (ntemp = outputs; ntemp->type >= 0; ntemp++) {
ntemp->identifier[0] = '\0';
}
for (ntemp = outputs; ntemp->type >= 0; ++ntemp) {
for (ntemp = outputs; ntemp->type >= 0; ntemp++) {
BLI_strncpy(ntemp->identifier, ntemp->name, sizeof(ntemp->identifier));
unique_socket_template_identifier(outputs, ntemp, ntemp->identifier, '_');
}
source/blender/blenkernel/intern/ocean.c
+29 -29
View File
@@ -521,7 +521,7 @@ static void ocean_compute_htilda(void *__restrict userdata,
/* Note the <= _N/2 here, see the FFTW documentation
* about the mechanics of the complex->real fft storage. */
for (j = 0; j <= o->_N / 2; ++j) {
for (j = 0; j <= o->_N / 2; j++) {
fftw_complex exp_param1;
fftw_complex exp_param2;
fftw_complex conj_param;
@@ -560,8 +560,8 @@ static void ocean_compute_displacement_x(TaskPool *__restrict pool,
const float chop_amount = osd->chop_amount;
int i, j;
for (i = 0; i < o->_M; ++i) {
for (j = 0; j <= o->_N / 2; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j <= o->_N / 2; j++) {
fftw_complex mul_param;
fftw_complex minus_i;
@@ -591,8 +591,8 @@ static void ocean_compute_displacement_z(TaskPool *__restrict pool,
const float chop_amount = osd->chop_amount;
int i, j;
for (i = 0; i < o->_M; ++i) {
for (j = 0; j <= o->_N / 2; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j <= o->_N / 2; j++) {
fftw_complex mul_param;
fftw_complex minus_i;
@@ -621,8 +621,8 @@ static void ocean_compute_jacobian_jxx(TaskPool *__restrict pool,
const float chop_amount = osd->chop_amount;
int i, j;
for (i = 0; i < o->_M; ++i) {
for (j = 0; j <= o->_N / 2; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j <= o->_N / 2; j++) {
fftw_complex mul_param;
/* init_complex(mul_param, -scale, 0); */
@@ -640,8 +640,8 @@ static void ocean_compute_jacobian_jxx(TaskPool *__restrict pool,
}
fftw_execute(o->_Jxx_plan);
for (i = 0; i < o->_M; ++i) {
for (j = 0; j < o->_N; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j < o->_N; j++) {
o->_Jxx[i * o->_N + j] += 1.0;
}
}
@@ -656,8 +656,8 @@ static void ocean_compute_jacobian_jzz(TaskPool *__restrict pool,
const float chop_amount = osd->chop_amount;
int i, j;
for (i = 0; i < o->_M; ++i) {
for (j = 0; j <= o->_N / 2; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j <= o->_N / 2; j++) {
fftw_complex mul_param;
/* init_complex(mul_param, -scale, 0); */
@@ -675,8 +675,8 @@ static void ocean_compute_jacobian_jzz(TaskPool *__restrict pool,
}
fftw_execute(o->_Jzz_plan);
for (i = 0; i < o->_M; ++i) {
for (j = 0; j < o->_N; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j < o->_N; j++) {
o->_Jzz[i * o->_N + j] += 1.0;
}
}
@@ -691,8 +691,8 @@ static void ocean_compute_jacobian_jxz(TaskPool *__restrict pool,
const float chop_amount = osd->chop_amount;
int i, j;
for (i = 0; i < o->_M; ++i) {
for (j = 0; j <= o->_N / 2; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j <= o->_N / 2; j++) {
fftw_complex mul_param;
/* init_complex(mul_param, -scale, 0); */
@@ -719,8 +719,8 @@ static void ocean_compute_normal_x(TaskPool *__restrict pool,
const Ocean *o = osd->o;
int i, j;
for (i = 0; i < o->_M; ++i) {
for (j = 0; j <= o->_N / 2; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j <= o->_N / 2; j++) {
fftw_complex mul_param;
init_complex(mul_param, 0.0, -1.0);
@@ -740,8 +740,8 @@ static void ocean_compute_normal_z(TaskPool *__restrict pool,
const Ocean *o = osd->o;
int i, j;
for (i = 0; i < o->_M; ++i) {
for (j = 0; j <= o->_N / 2; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j <= o->_N / 2; j++) {
fftw_complex mul_param;
init_complex(mul_param, 0.0, -1.0);
@@ -829,8 +829,8 @@ static void set_height_normalize_factor(struct Ocean *oc)
BLI_rw_mutex_lock(&oc->oceanmutex, THREAD_LOCK_READ);
for (i = 0; i < oc->_M; ++i) {
for (j = 0; j < oc->_N; ++j) {
for (i = 0; i < oc->_M; i++) {
for (j = 0; j < oc->_N; j++) {
if (max_h < fabs(oc->_disp_y[i * oc->_N + j])) {
max_h = fabs(oc->_disp_y[i * oc->_N + j]);
}
@@ -959,28 +959,28 @@ void BKE_ocean_init(struct Ocean *o,
}
/* the +ve components and DC */
for (i = 0; i <= o->_M / 2; ++i) {
for (i = 0; i <= o->_M / 2; i++) {
o->_kx[i] = 2.0f * (float)M_PI * i / o->_Lx;
}
/* the -ve components */
for (i = o->_M - 1, ii = 0; i > o->_M / 2; --i, ++ii) {
for (i = o->_M - 1, ii = 0; i > o->_M / 2; i--, ii++) {
o->_kx[i] = -2.0f * (float)M_PI * ii / o->_Lx;
}
/* the +ve components and DC */
for (i = 0; i <= o->_N / 2; ++i) {
for (i = 0; i <= o->_N / 2; i++) {
o->_kz[i] = 2.0f * (float)M_PI * i / o->_Lz;
}
/* the -ve components */
for (i = o->_N - 1, ii = 0; i > o->_N / 2; --i, ++ii) {
for (i = o->_N - 1, ii = 0; i > o->_N / 2; i--, ii++) {
o->_kz[i] = -2.0f * (float)M_PI * ii / o->_Lz;
}
/* pre-calculate the k matrix */
for (i = 0; i < o->_M; ++i) {
for (j = 0; j <= o->_N / 2; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j <= o->_N / 2; j++) {
o->_k[i * (1 + o->_N / 2) + j] = sqrt(o->_kx[i] * o->_kx[i] + o->_kz[j] * o->_kz[j]);
}
}
@@ -988,8 +988,8 @@ void BKE_ocean_init(struct Ocean *o,
/*srand(seed);*/
rng = BLI_rng_new(seed);
for (i = 0; i < o->_M; ++i) {
for (j = 0; j < o->_N; ++j) {
for (i = 0; i < o->_M; i++) {
for (j = 0; j < o->_N; j++) {
float r1 = gaussRand(rng);
float r2 = gaussRand(rng);
source/blender/blenkernel/intern/paint.c
+1 -1
View File
@@ -1227,7 +1227,7 @@ static void sculpt_update_object(
BKE_crazyspace_build_sculpt(depsgraph, scene, ob, &ss->deform_imats, &ss->deform_cos);
BKE_pbvh_vert_coords_apply(ss->pbvh, ss->deform_cos, me->totvert);
for (a = 0; a < me->totvert; ++a) {
for (a = 0; a < me->totvert; a++) {
invert_m3(ss->deform_imats[a]);
}
}
source/blender/blenkernel/intern/particle.c
+5 -5
View File
@@ -88,7 +88,7 @@ float PSYS_FRAND_BASE[PSYS_FRAND_COUNT];
void psys_init_rng(void)
{
RNG *rng = BLI_rng_new_srandom(5831); /* arbitrary */
for (int i = 0; i < PSYS_FRAND_COUNT; ++i) {
for (int i = 0; i < PSYS_FRAND_COUNT; i++) {
PSYS_FRAND_BASE[i] = BLI_rng_get_float(rng);
PSYS_FRAND_SEED_OFFSET[i] = (unsigned int)BLI_rng_get_int(rng);
PSYS_FRAND_SEED_MULTIPLIER[i] = (unsigned int)BLI_rng_get_int(rng);
@@ -2747,7 +2747,7 @@ static void exec_child_path_cache(TaskPool *__restrict UNUSED(pool),
int i;
cpa = psys->child + task->begin;
for (i = task->begin; i < task->end; ++i, ++cpa) {
for (i = task->begin; i < task->end; i++, cpa++) {
BLI_assert(i < psys->totchildcache);
psys_thread_create_path(task, cpa, cache[i], i);
}
@@ -2794,7 +2794,7 @@ void psys_cache_child_paths(ParticleSimulationData *sim,
/* cache parent paths */
ctx.parent_pass = 1;
psys_tasks_create(&ctx, 0, totparent, &tasks_parent, &numtasks_parent);
for (i = 0; i < numtasks_parent; ++i) {
for (i = 0; i < numtasks_parent; i++) {
ParticleTask *task = &tasks_parent[i];
psys_task_init_path(task, sim);
@@ -2805,7 +2805,7 @@ void psys_cache_child_paths(ParticleSimulationData *sim,
/* cache child paths */
ctx.parent_pass = 0;
psys_tasks_create(&ctx, totparent, totchild, &tasks_child, &numtasks_child);
for (i = 0; i < numtasks_child; ++i) {
for (i = 0; i < numtasks_child; i++) {
ParticleTask *task = &tasks_child[i];
psys_task_init_path(task, sim);
@@ -3011,7 +3011,7 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra, const bool use_re
if (part->type == PART_HAIR) {
HairKey *hkey;
for (k = 0, hkey = pa->hair; k < pa->totkey; ++k, ++hkey) {
for (k = 0, hkey = pa->hair; k < pa->totkey; k++, hkey++) {
mul_v3_m4v3(hkey->world_co, hairmat, hkey->co);
}
}
source/blender/blenkernel/intern/particle_child.c
+1 -1
View File
@@ -381,7 +381,7 @@ void psys_apply_child_modifiers(ParticleThreadContext *ctx,
}
/* we have to correct velocity because of kink & clump */
for (k = 0, key = keys; k < totkeys; ++k, ++key) {
for (k = 0, key = keys; k < totkeys; k++, key++) {
if (k >= 2) {
sub_v3_v3v3((key - 1)->vel, key->co, (key - 2)->co);
mul_v3_fl((key - 1)->vel, 0.5);
source/blender/blenkernel/intern/particle_distribute.c
+6 -6
View File
@@ -787,17 +787,17 @@ static void exec_distribute_parent(TaskPool *__restrict UNUSED(pool),
pa = psys->particles + task->begin;
switch (psys->part->from) {
case PART_FROM_FACE:
for (p = task->begin; p < task->end; ++p, ++pa) {
for (p = task->begin; p < task->end; p++, pa++) {
distribute_from_faces_exec(task, pa, p);
}
break;
case PART_FROM_VOLUME:
for (p = task->begin; p < task->end; ++p, ++pa) {
for (p = task->begin; p < task->end; p++, pa++) {
distribute_from_volume_exec(task, pa, p);
}
break;
case PART_FROM_VERT:
for (p = task->begin; p < task->end; ++p, ++pa) {
for (p = task->begin; p < task->end; p++, pa++) {
distribute_from_verts_exec(task, pa, p);
}
break;
@@ -815,11 +815,11 @@ static void exec_distribute_child(TaskPool *__restrict UNUSED(pool),
/* RNG skipping at the beginning */
cpa = psys->child;
for (p = 0; p < task->begin; ++p, ++cpa) {
for (p = 0; p < task->begin; p++, cpa++) {
BLI_rng_skip(task->rng, PSYS_RND_DIST_SKIP);
}
for (; p < task->end; ++p, ++cpa) {
for (; p < task->end; p++, cpa++) {
distribute_children_exec(task, cpa, p);
}
}
@@ -1341,7 +1341,7 @@ static void distribute_particles_on_dm(ParticleSimulationData *sim, int from)
totpart = (from == PART_FROM_CHILD ? sim->psys->totchild : sim->psys->totpart);
psys_tasks_create(&ctx, 0, totpart, &tasks, &numtasks);
for (i = 0; i < numtasks; ++i) {
for (i = 0; i < numtasks; i++) {
ParticleTask *task = &tasks[i];
psys_task_init_distribute(task, sim);
source/blender/blenkernel/intern/particle_system.c
+1 -1
View File
@@ -501,7 +501,7 @@ void psys_tasks_free(ParticleTask *tasks, int numtasks)
int i;
/* threads */
for (i = 0; i < numtasks; ++i) {
for (i = 0; i < numtasks; i++) {
if (tasks[i].rng) {
BLI_rng_free(tasks[i].rng);
}
source/blender/blenkernel/intern/pbvh.c
+36 -36
View File
@@ -80,7 +80,7 @@ void BB_reset(BB *bb)
/* Expand the bounding box to include a new coordinate */
void BB_expand(BB *bb, const float co[3])
{
for (int i = 0; i < 3; ++i) {
for (int i = 0; i < 3; i++) {
bb->bmin[i] = min_ff(bb->bmin[i], co[i]);
bb->bmax[i] = max_ff(bb->bmax[i], co[i]);
}
@@ -89,7 +89,7 @@ void BB_expand(BB *bb, const float co[3])
/* Expand the bounding box to include another bounding box */
void BB_expand_with_bb(BB *bb, BB *bb2)
{
for (int i = 0; i < 3; ++i) {
for (int i = 0; i < 3; i++) {
bb->bmin[i] = min_ff(bb->bmin[i], bb2->bmin[i]);
bb->bmax[i] = max_ff(bb->bmax[i], bb2->bmax[i]);
}
@@ -100,7 +100,7 @@ int BB_widest_axis(const BB *bb)
{
float dim[3];
for (int i = 0; i < 3; ++i) {
for (int i = 0; i < 3; i++) {
dim[i] = bb->bmax[i] - bb->bmin[i];
}
@@ -124,7 +124,7 @@ int BB_widest_axis(const BB *bb)
void BBC_update_centroid(BBC *bbc)
{
for (int i = 0; i < 3; ++i) {
for (int i = 0; i < 3; i++) {
bbc->bcentroid[i] = (bbc->bmin[i] + bbc->bmax[i]) * 0.5f;
}
}
@@ -294,9 +294,9 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node)
node->face_vert_indices = (const int(*)[3])face_vert_indices;
for (int i = 0; i < totface; ++i) {
for (int i = 0; i < totface; i++) {
const MLoopTri *lt = &bvh->looptri[node->prim_indices[i]];
for (int j = 0; j < 3; ++j) {
for (int j = 0; j < 3; j++) {
face_vert_indices[i][j] = map_insert_vert(
bvh, map, &node->face_verts, &node->uniq_verts, bvh->mloop[lt->tri[j]].v);
}
@@ -323,10 +323,10 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node)
vert_indices[ndx] = POINTER_AS_INT(BLI_ghashIterator_getKey(&gh_iter));
}
for (int i = 0; i < totface; ++i) {
for (int i = 0; i < totface; i++) {
const int sides = 3;
for (int j = 0; j < sides; ++j) {
for (int j = 0; j < sides; j++) {
if (face_vert_indices[i][j] < 0) {
face_vert_indices[i][j] = -face_vert_indices[i][j] + node->uniq_verts - 1;
}
@@ -343,7 +343,7 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node)
static void update_vb(PBVH *bvh, PBVHNode *node, BBC *prim_bbc, int offset, int count)
{
BB_reset(&node->vb);
for (int i = offset + count - 1; i >= offset; --i) {
for (int i = offset + count - 1; i >= offset; i--) {
BB_expand_with_bb(&node->vb, (BB *)(&prim_bbc[bvh->prim_indices[i]]));
}
node->orig_vb = node->vb;
@@ -420,7 +420,7 @@ static bool leaf_needs_material_split(PBVH *bvh, int offset, int count)
const MLoopTri *first = &bvh->looptri[bvh->prim_indices[offset]];
const MPoly *mp = &bvh->mpoly[first->poly];
for (int i = offset + count - 1; i > offset; --i) {
for (int i = offset + count - 1; i > offset; i--) {
int prim = bvh->prim_indices[i];
const MPoly *mp_other = &bvh->mpoly[bvh->looptri[prim].poly];
if (!face_materials_match(mp, mp_other)) {
@@ -431,7 +431,7 @@ static bool leaf_needs_material_split(PBVH *bvh, int offset, int count)
else {
const DMFlagMat *first = &bvh->grid_flag_mats[bvh->prim_indices[offset]];
for (int i = offset + count - 1; i > offset; --i) {
for (int i = offset + count - 1; i > offset; i--) {
int prim = bvh->prim_indices[i];
if (!grid_materials_match(first, &bvh->grid_flag_mats[prim])) {
return true;
@@ -479,7 +479,7 @@ static void build_sub(PBVH *bvh, int node_index, BB *cb, BBC *prim_bbc, int offs
if (!cb) {
cb = &cb_backing;
BB_reset(cb);
for (int i = offset + count - 1; i >= offset; --i) {
for (int i = offset + count - 1; i >= offset; i--) {
BB_expand(cb, prim_bbc[bvh->prim_indices[i]].bcentroid);
}
}
@@ -515,7 +515,7 @@ static void pbvh_build(PBVH *bvh, BB *cb, BBC *prim_bbc, int totprim)
MEM_freeN(bvh->prim_indices);
}
bvh->prim_indices = MEM_mallocN(sizeof(int) * totprim, "bvh prim indices");
for (int i = 0; i < totprim; ++i) {
for (int i = 0; i < totprim; i++) {
bvh->prim_indices[i] = i;
}
bvh->totnode = 0;
@@ -564,14 +564,14 @@ void BKE_pbvh_build_mesh(PBVH *bvh,
/* For each face, store the AABB and the AABB centroid */
prim_bbc = MEM_mallocN(sizeof(BBC) * looptri_num, "prim_bbc");
for (int i = 0; i < looptri_num; ++i) {
for (int i = 0; i < looptri_num; i++) {
const MLoopTri *lt = &looptri[i];
const int sides = 3;
BBC *bbc = prim_bbc + i;
BB_reset((BB *)bbc);
for (int j = 0; j < sides; ++j) {
for (int j = 0; j < sides; j++) {
BB_expand((BB *)bbc, verts[bvh->mloop[lt->tri[j]].v].co);
}
@@ -614,13 +614,13 @@ void BKE_pbvh_build_grids(PBVH *bvh,
/* For each grid, store the AABB and the AABB centroid */
BBC *prim_bbc = MEM_mallocN(sizeof(BBC) * totgrid, "prim_bbc");
for (int i = 0; i < totgrid; ++i) {
for (int i = 0; i < totgrid; i++) {
CCGElem *grid = grids[i];
BBC *bbc = prim_bbc + i;
BB_reset((BB *)bbc);
for (int j = 0; j < gridsize * gridsize; ++j) {
for (int j = 0; j < gridsize * gridsize; j++) {
BB_expand((BB *)bbc, CCG_elem_offset_co(key, grid, j));
}
@@ -645,7 +645,7 @@ PBVH *BKE_pbvh_new(void)
void BKE_pbvh_free(PBVH *bvh)
{
for (int i = 0; i < bvh->totnode; ++i) {
for (int i = 0; i < bvh->totnode; i++) {
PBVHNode *node = &bvh->nodes[i];
if (node->flag & PBVH_Leaf) {
@@ -697,7 +697,7 @@ void BKE_pbvh_free(PBVH *bvh)
void BKE_pbvh_free_layer_disp(PBVH *bvh)
{
for (int i = 0; i < bvh->totnode; ++i) {
for (int i = 0; i < bvh->totnode; i++) {
BKE_pbvh_node_layer_disp_free(&bvh->nodes[i]);
}
}
@@ -1010,7 +1010,7 @@ static void pbvh_update_normals_accum_task_cb(void *__restrict userdata,
const int *faces = node->prim_indices;
const int totface = node->totprim;
for (int i = 0; i < totface; ++i) {
for (int i = 0; i < totface; i++) {
const MLoopTri *lt = &bvh->looptri[faces[i]];
const unsigned int vtri[3] = {
bvh->mloop[lt->tri[0]].v,
@@ -1056,7 +1056,7 @@ static void pbvh_update_normals_store_task_cb(void *__restrict userdata,
const int *verts = node->vert_indices;
const int totvert = node->uniq_verts;
for (int i = 0; i < totvert; ++i) {
for (int i = 0; i < totvert; i++) {
const int v = verts[i];
MVert *mvert = &bvh->verts[v];
@@ -1308,7 +1308,7 @@ void BKE_pbvh_get_grid_updates(PBVH *bvh, bool clear, void ***r_gridfaces, int *
while ((node = pbvh_iter_next(&iter))) {
if (node->flag & PBVH_UpdateNormals) {
for (unsigned i = 0; i < node->totprim; ++i) {
for (unsigned i = 0; i < node->totprim; i++) {
void *face = bvh->gridfaces[node->prim_indices[i]];
BLI_gset_add(face_set, face);
}
@@ -1581,7 +1581,7 @@ bool BKE_pbvh_node_vert_update_check_any(PBVH *bvh, PBVHNode *node)
const int *verts = node->vert_indices;
const int totvert = node->uniq_verts + node->face_verts;
for (int i = 0; i < totvert; ++i) {
for (int i = 0; i < totvert; i++) {
const int v = verts[i];
const MVert *mvert = &bvh->verts[v];
@@ -1769,7 +1769,7 @@ static bool pbvh_faces_node_raycast(PBVH *bvh,
float nearest_vertex_co[3];
copy_v3_fl(nearest_vertex_co, 0.0f);
for (i = 0; i < totface; ++i) {
for (i = 0; i < totface; i++) {
const MLoopTri *lt = &bvh->looptri[faces[i]];
const int *face_verts = node->face_vert_indices[i];
@@ -1827,7 +1827,7 @@ static bool pbvh_grids_node_raycast(PBVH *bvh,
const int gridsize = bvh->gridkey.grid_size;
bool hit = false;
for (int i = 0; i < totgrid; ++i) {
for (int i = 0; i < totgrid; i++) {
CCGElem *grid = bvh->grids[node->prim_indices[i]];
BLI_bitmap *gh;
@@ -1837,8 +1837,8 @@ static bool pbvh_grids_node_raycast(PBVH *bvh,
gh = bvh->grid_hidden[node->prim_indices[i]];
for (int y = 0; y < gridsize - 1; ++y) {
for (int x = 0; x < gridsize - 1; ++x) {
for (int y = 0; y < gridsize - 1; y++) {
for (int x = 0; x < gridsize - 1; x++) {
/* check if grid face is hidden */
if (gh) {
if (paint_is_grid_face_hidden(gh, gridsize, x, y)) {
@@ -2029,7 +2029,7 @@ static bool pbvh_faces_node_nearest_to_ray(PBVH *bvh,
int i, totface = node->totprim;
bool hit = false;
for (i = 0; i < totface; ++i) {
for (i = 0; i < totface; i++) {
const MLoopTri *lt = &bvh->looptri[faces[i]];
const int *face_verts = node->face_vert_indices[i];
@@ -2074,7 +2074,7 @@ static bool pbvh_grids_node_nearest_to_ray(PBVH *bvh,
const int gridsize = bvh->gridkey.grid_size;
bool hit = false;
for (int i = 0; i < totgrid; ++i) {
for (int i = 0; i < totgrid; i++) {
CCGElem *grid = bvh->grids[node->prim_indices[i]];
BLI_bitmap *gh;
@@ -2084,8 +2084,8 @@ static bool pbvh_grids_node_nearest_to_ray(PBVH *bvh,
gh = bvh->grid_hidden[node->prim_indices[i]];
for (int y = 0; y < gridsize - 1; ++y) {
for (int x = 0; x < gridsize - 1; ++x) {
for (int y = 0; y < gridsize - 1; y++) {
for (int x = 0; x < gridsize - 1; x++) {
/* check if grid face is hidden */
if (gh) {
if (paint_is_grid_face_hidden(gh, gridsize, x, y)) {
@@ -2175,8 +2175,8 @@ static PlaneAABBIsect test_planes_aabb(const float bb_min[3],
float vmin[3], vmax[3];
PlaneAABBIsect ret = ISECT_INSIDE;
for (int i = 0; i < 4; ++i) {
for (int axis = 0; axis < 3; ++axis) {
for (int i = 0; i < 4; i++) {
for (int axis = 0; axis < 3; axis++) {
if (planes[i][axis] > 0) {
vmin[axis] = bb_min[axis];
vmax[axis] = bb_max[axis];
@@ -2322,7 +2322,7 @@ void BKE_pbvh_grids_update(
bvh->grid_flag_mats = flagmats;
bvh->grid_hidden = grid_hidden;
for (int a = 0; a < bvh->totnode; ++a) {
for (int a = 0; a < bvh->totnode; a++) {
BKE_pbvh_node_mark_rebuild_draw(&bvh->nodes[a]);
}
}
@@ -2390,7 +2390,7 @@ void BKE_pbvh_vert_coords_apply(PBVH *pbvh, const float (*vertCos)[3], const int
if (pbvh->verts) {
MVert *mvert = pbvh->verts;
/* copy new verts coords */
for (int a = 0; a < pbvh->totvert; ++a, ++mvert) {
for (int a = 0; a < pbvh->totvert; a++, mvert++) {
/* no need for float comparison here (memory is exactly equal or not) */
if (memcmp(mvert->co, vertCos[a], sizeof(float[3])) != 0) {
copy_v3_v3(mvert->co, vertCos[a]);
@@ -2402,7 +2402,7 @@ void BKE_pbvh_vert_coords_apply(PBVH *pbvh, const float (*vertCos)[3], const int
BKE_mesh_calc_normals_looptri(
pbvh->verts, pbvh->totvert, pbvh->mloop, pbvh->looptri, pbvh->totprim, NULL);
for (int a = 0; a < pbvh->totnode; ++a) {
for (int a = 0; a < pbvh->totnode; a++) {
BKE_pbvh_node_mark_update(&pbvh->nodes[a]);
}
source/blender/blenkernel/intern/scene.c
+2 -2
View File
@@ -1557,7 +1557,7 @@ static void scene_graph_update_tagged(Depsgraph *depsgraph, Main *bmain, bool on
BLI_callback_exec(bmain, &scene->id, BLI_CB_EVT_DEPSGRAPH_UPDATE_PRE);
}
for (int pass = 0; pass < 2; ++pass) {
for (int pass = 0; pass < 2; pass++) {
/* (Re-)build dependency graph if needed. */
DEG_graph_relations_update(depsgraph, bmain, scene, view_layer);
/* Uncomment this to check if graph was properly tagged for update. */
@@ -1609,7 +1609,7 @@ void BKE_scene_graph_update_for_newframe(Depsgraph *depsgraph, Main *bmain)
/* Keep this first. */
BLI_callback_exec(bmain, &scene->id, BLI_CB_EVT_FRAME_CHANGE_PRE);
for (int pass = 0; pass < 2; ++pass) {
for (int pass = 0; pass < 2; pass++) {
/* Update animated image textures for particles, modifiers, gpu, etc,
* call this at the start so modifiers with textures don't lag 1 frame.
*/
source/blender/blenkernel/intern/seqeffects.c
+12 -12
View File
@@ -3434,13 +3434,13 @@ static void do_gaussian_blur_effect_byte_x(Sequence *seq,
float *gausstab_x;
gausstab_x = make_gaussian_blur_kernel(data->size_x, size_x);
for (i = 0; i < y; ++i) {
for (j = 0; j < x; ++j) {
for (i = 0; i < y; i++) {
for (j = 0; j < x; j++) {
int out_index = INDEX(j, i);
float accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float accum_weight = 0.0f;
for (int current_x = j - size_x; current_x <= j + size_x; ++current_x) {
for (int current_x = j - size_x; current_x <= j + size_x; current_x++) {
if (current_x < 0 || current_x >= frame_width) {
/* Out of bounds. */
continue;
@@ -3484,12 +3484,12 @@ static void do_gaussian_blur_effect_byte_y(Sequence *seq,
float *gausstab_y;
gausstab_y = make_gaussian_blur_kernel(data->size_y, size_y);
for (i = 0; i < y; ++i) {
for (j = 0; j < x; ++j) {
for (i = 0; i < y; i++) {
for (j = 0; j < x; j++) {
int out_index = INDEX(j, i);
float accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float accum_weight = 0.0f;
for (int current_y = i - size_y; current_y <= i + size_y; ++current_y) {
for (int current_y = i - size_y; current_y <= i + size_y; current_y++) {
if (current_y < -start_line || current_y + start_line >= frame_height) {
/* Out of bounds. */
continue;
@@ -3532,12 +3532,12 @@ static void do_gaussian_blur_effect_float_x(Sequence *seq,
float *gausstab_x;
gausstab_x = make_gaussian_blur_kernel(data->size_x, size_x);
for (i = 0; i < y; ++i) {
for (j = 0; j < x; ++j) {
for (i = 0; i < y; i++) {
for (j = 0; j < x; j++) {
int out_index = INDEX(j, i);
float accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float accum_weight = 0.0f;
for (int current_x = j - size_x; current_x <= j + size_x; ++current_x) {
for (int current_x = j - size_x; current_x <= j + size_x; current_x++) {
if (current_x < 0 || current_x >= frame_width) {
/* Out of bounds. */
continue;
@@ -3573,12 +3573,12 @@ static void do_gaussian_blur_effect_float_y(Sequence *seq,
float *gausstab_y;
gausstab_y = make_gaussian_blur_kernel(data->size_y, size_y);
for (i = 0; i < y; ++i) {
for (j = 0; j < x; ++j) {
for (i = 0; i < y; i++) {
for (j = 0; j < x; j++) {
int out_index = INDEX(j, i);
float accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float accum_weight = 0.0f;
for (int current_y = i - size_y; current_y <= i + size_y; ++current_y) {
for (int current_y = i - size_y; current_y <= i + size_y; current_y++) {
if (current_y < -start_line || current_y + start_line >= frame_height) {
/* Out of bounds. */
continue;
source/blender/blenkernel/intern/studiolight.c
+5 -5
View File
@@ -762,7 +762,7 @@ static void studiolight_spherical_harmonics_calculate_coefficients(StudioLight *
/* The sum of solid angle should be equal to the solid angle of the sphere (4 PI),
* so normalize in order to make our weightAccum exactly match 4 PI. */
for (int i = 0; i < STUDIOLIGHT_SH_COEFS_LEN; ++i) {
for (int i = 0; i < STUDIOLIGHT_SH_COEFS_LEN; i++) {
mul_v3_fl(sh[i], M_PI * 4.0f / weight_accum);
}
}
@@ -801,11 +801,11 @@ static float studiolight_spherical_harmonics_lambda_get(float *sh, float max_lap
}
const int no_iterations = 10000000;
for (int i = 0; i < no_iterations; ++i) {
for (int i = 0; i < no_iterations; i++) {
float f = 0.0f;
float fd = 0.0f;
for (int level = 1; level < STUDIOLIGHT_SH_BANDS; ++level) {
for (int level = 1; level < STUDIOLIGHT_SH_BANDS; level++) {
f += table_l[level] * table_b[level] / SQUARE(1.0f + lambda * table_l[level]);
fd += (2.0f * SQUARE(table_l[level]) * table_b[level]) /
CUBE(1.0f + lambda * table_l[level]);
@@ -882,7 +882,7 @@ BLI_INLINE void studiolight_spherical_harmonics_eval(StudioLight *sl,
{
#if STUDIOLIGHT_SH_BANDS == 2
float(*sh)[3] = (float(*)[3])sl->spherical_harmonics_coefs;
for (int i = 0; i < 3; ++i) {
for (int i = 0; i < 3; i++) {
color[i] = studiolight_spherical_harmonics_geomerics_eval(
normal, sh[0][i], sh[1][i], sh[2][i], sh[3][i]);
}
@@ -1118,7 +1118,7 @@ static void studiolight_lights_eval(StudioLight *sl, float color[3], const float
copy_v3_v3(spec_light, sl->light_ambient);
reflect_v3_v3v3(R, I, N);
for (int i = 0; i < 3; ++i) {
for (int i = 0; i < 3; i++) {
SolidLight *light = &sl->light[i];
if (light->flag) {
/* Diffuse lighting */
source/blender/blenkernel/intern/subdiv_converter_mesh.c
+1 -1
View File
@@ -221,7 +221,7 @@ static void precalc_uv_layer(const OpenSubdiv_Converter *converter, const int la
mpoly, mloop, mloopuv, num_poly, num_vert, limit, false, true);
/* NOTE: First UV vertex is supposed to be always marked as separate. */
storage->num_uv_coordinates = -1;
for (int vertex_index = 0; vertex_index < num_vert; ++vertex_index) {
for (int vertex_index = 0; vertex_index < num_vert; vertex_index++) {
const UvMapVert *uv_vert = BKE_mesh_uv_vert_map_get_vert(uv_vert_map, vertex_index);
while (uv_vert != NULL) {
if (uv_vert->separate) {
source/blender/blenkernel/intern/subdiv_eval.c
+1 -1
View File
@@ -101,7 +101,7 @@ static void set_face_varying_data_from_uv(Subdiv *subdiv,
/* TODO(sergey): OpenSubdiv's C-API converter can change winding of
* loops of a face, need to watch for that, to prevent wrong UVs assigned.
*/
for (int face_index = 0; face_index < num_faces; ++face_index) {
for (int face_index = 0; face_index < num_faces; face_index++) {
const int num_face_vertices = topology_refiner->getNumFaceVertices(topology_refiner,
face_index);
const int *uv_indices = topology_refiner->getFaceFVarValueIndices(
source/blender/blenkernel/intern/subdiv_mesh.c
+3 -3
View File
@@ -82,7 +82,7 @@ static void subdiv_mesh_ctx_cache_uv_layers(SubdivMeshContext *ctx)
{
Mesh *subdiv_mesh = ctx->subdiv_mesh;
ctx->num_uv_layers = CustomData_number_of_layers(&subdiv_mesh->ldata, CD_MLOOPUV);
for (int layer_index = 0; layer_index < ctx->num_uv_layers; ++layer_index) {
for (int layer_index = 0; layer_index < ctx->num_uv_layers; layer_index++) {
ctx->uv_layers[layer_index] = CustomData_get_layer_n(
&subdiv_mesh->ldata, CD_MLOOPUV, layer_index);
}
@@ -220,7 +220,7 @@ static void vertex_interpolation_init(const SubdivMeshContext *ctx,
const float weight = 1.0f / (float)coarse_poly->totloop;
float *weights = BLI_array_alloca(weights, coarse_poly->totloop);
int *indices = BLI_array_alloca(indices, coarse_poly->totloop);
for (int i = 0; i < coarse_poly->totloop; ++i) {
for (int i = 0; i < coarse_poly->totloop; i++) {
weights[i] = weight;
indices[i] = coarse_mloop[coarse_poly->loopstart + i].v;
}
@@ -352,7 +352,7 @@ static void loop_interpolation_init(const SubdivMeshContext *ctx,
const float weight = 1.0f / (float)coarse_poly->totloop;
float *weights = BLI_array_alloca(weights, coarse_poly->totloop);
int *indices = BLI_array_alloca(indices, coarse_poly->totloop);
for (int i = 0; i < coarse_poly->totloop; ++i) {
for (int i = 0; i < coarse_poly->totloop; i++) {
weights[i] = weight;
indices[i] = coarse_poly->loopstart + i;
}
source/blender/blenkernel/intern/subsurf_ccg.c
+6 -6
View File
@@ -1784,7 +1784,7 @@ static void *ccgDM_get_tessface_data_layer(DerivedMesh *dm, int type)
/* With ccgdm, we have a simple one to one mapping between loops
* and tessellated face corners. */
for (i = 0; i < numLoops; ++i, ++tlnors_it, ++lnors) {
for (i = 0; i < numLoops; i++, tlnors_it++, lnors++) {
normal_float_to_short_v3(*tlnors_it, *lnors);
}
}
@@ -2263,7 +2263,7 @@ static void set_ccgdm_all_geometry(CCGDerivedMesh *ccgdm,
}
if (edgeOrigIndex) {
for (i = 0; i < numFinalEdges; ++i) {
for (i = 0; i < numFinalEdges; i++) {
edgeOrigIndex[edgeNum + i] = ORIGINDEX_NONE;
}
}
@@ -2321,7 +2321,7 @@ static void set_ccgdm_all_geometry(CCGDerivedMesh *ccgdm,
edgeNum += numFinalEdges;
}
for (index = 0; index < totedge; ++index) {
for (index = 0; index < totedge; index++) {
CCGEdge *e = ccgdm->edgeMap[index].edge;
int numFinalEdges = edgeSize - 1;
int mapIndex = ccgDM_getEdgeMapIndex(ss, e);
@@ -2359,13 +2359,13 @@ static void set_ccgdm_all_geometry(CCGDerivedMesh *ccgdm,
if (has_edge_cd) {
BLI_assert(edgeIdx >= 0 && edgeIdx < dm->getNumEdges(dm));
for (i = 0; i < numFinalEdges; ++i) {
for (i = 0; i < numFinalEdges; i++) {
CustomData_copy_data(&dm->edgeData, &ccgdm->dm.edgeData, edgeIdx, edgeNum + i, 1);
}
}
if (edgeOrigIndex) {
for (i = 0; i < numFinalEdges; ++i) {
for (i = 0; i < numFinalEdges; i++) {
edgeOrigIndex[edgeNum + i] = mapIndex;
}
}
@@ -2384,7 +2384,7 @@ static void set_ccgdm_all_geometry(CCGDerivedMesh *ccgdm,
}
}
for (index = 0; index < totvert; ++index) {
for (index = 0; index < totvert; index++) {
CCGVert *v = ccgdm->vertMap[index].vert;
int mapIndex = ccgDM_getVertMapIndex(ccgdm->ss, v);
int vertIdx;
source/blender/blenkernel/intern/tracking.c
+3 -3
View File
@@ -1843,18 +1843,18 @@ void BKE_tracking_plane_marker_get_subframe_corners(MovieTrackingPlaneTrack *pla
MovieTrackingPlaneMarker *marker_next = marker + 1;
if (marker_next->framenr == marker->framenr + 1) {
float fac = (framenr - (int)framenr) / (marker_next->framenr - marker->framenr);
for (i = 0; i < 4; ++i) {
for (i = 0; i < 4; i++) {
interp_v2_v2v2(corners[i], marker->corners[i], marker_next->corners[i], fac);
}
}
else {
for (i = 0; i < 4; ++i) {
for (i = 0; i < 4; i++) {
copy_v2_v2(corners[i], marker->corners[i]);
}
}
}
else {
for (i = 0; i < 4; ++i) {
for (i = 0; i < 4; i++) {
copy_v2_v2(corners[i], marker->corners[i]);
}
}
source/blender/blenkernel/intern/tracking_auto.c
+10 -10
View File
@@ -133,7 +133,7 @@ static void dna_marker_to_libmv_marker(/*const*/ MovieTrackingTrack *track,
libmv_marker->track = track_index;
normalized_to_libmv_frame(marker->pos, frame_dimensions, libmv_marker->center);
for (i = 0; i < 4; ++i) {
for (i = 0; i < 4; i++) {
normalized_relative_to_libmv_frame(
marker->pattern_corners[i], marker->pos, frame_dimensions, libmv_marker->patch[i]);
}
@@ -187,7 +187,7 @@ static void libmv_marker_to_dna_marker(libmv_Marker *libmv_marker,
marker->framenr = libmv_marker->frame;
libmv_frame_to_normalized(libmv_marker->center, frame_dimensions, marker->pos);
for (i = 0; i < 4; ++i) {
for (i = 0; i < 4; i++) {
libmv_frame_to_normalized_relative(libmv_marker->patch[i],
libmv_marker->center,
frame_dimensions,
@@ -261,7 +261,7 @@ static void fill_autotrack_tracks(const int frame_width,
/* Count number of markers to be put to a context. */
size_t num_trackable_markers = 0;
for (MovieTrackingTrack *track = tracksbase->first; track != NULL; track = track->next) {
for (int i = 0; i < track->markersnr; ++i) {
for (int i = 0; i < track->markersnr; i++) {
const MovieTrackingMarker *marker = track->markers + i;
if ((marker->flag & MARKER_DISABLED) == 0) {
num_trackable_markers++;
@@ -278,7 +278,7 @@ static void fill_autotrack_tracks(const int frame_width,
/* Fill in markers array. */
int track_index = 0, num_filled_libmv_markers = 0;
for (MovieTrackingTrack *track = tracksbase->first; track != NULL; track = track->next) {
for (int i = 0; i < track->markersnr; ++i) {
for (int i = 0; i < track->markersnr; i++) {
MovieTrackingMarker *marker = track->markers + i;
if ((marker->flag & MARKER_DISABLED) != 0) {
continue;
@@ -319,7 +319,7 @@ static void create_per_track_tracking_options(const MovieClip *clip,
int i = 0, track_index = 0;
for (MovieTrackingTrack *track = tracksbase->first; track != NULL; track = track->next) {
if (!check_track_trackable(clip, track, user)) {
++track_index;
track_index++;
continue;
}
AutoTrackOptions *options = &context->options[i++];
@@ -330,7 +330,7 @@ static void create_per_track_tracking_options(const MovieClip *clip,
tracking_configure_tracker(track, NULL, &options->track_region_options);
options->use_keyframe_match = track->pattern_match == TRACK_MATCH_KEYFRAME;
context->tracks[track_index] = track;
++track_index;
track_index++;
}
}
@@ -471,7 +471,7 @@ void BKE_autotrack_context_sync(AutoTrackContext *context)
libmv_Marker libmv_marker;
int clip = 0;
int track;
for (track = 0; track < context->num_tracks; ++track) {
for (track = 0; track < context->num_tracks; track++) {
AutoTrackOptions *options = &context->options[track];
int track_frame = BKE_movieclip_remap_scene_to_clip_frame(
context->clips[options->clip_index], frame);
@@ -506,7 +506,7 @@ void BKE_autotrack_context_sync(AutoTrackContext *context)
}
BLI_spin_unlock(&context->spin_lock);
for (int clip = 0; clip < context->num_clips; ++clip) {
for (int clip = 0; clip < context->num_clips; clip++) {
MovieTracking *tracking = &context->clips[clip]->tracking;
BKE_tracking_dopesheet_tag_update(tracking);
}
@@ -524,7 +524,7 @@ void BKE_autotrack_context_finish(AutoTrackContext *context)
{
int clip_index;
for (clip_index = 0; clip_index < context->num_clips; ++clip_index) {
for (clip_index = 0; clip_index < context->num_clips; clip_index++) {
MovieClip *clip = context->clips[clip_index];
ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(&clip->tracking);
MovieTrackingPlaneTrack *plane_track;
@@ -532,7 +532,7 @@ void BKE_autotrack_context_finish(AutoTrackContext *context)
for (plane_track = plane_tracks_base->first; plane_track; plane_track = plane_track->next) {
if ((plane_track->flag & PLANE_TRACK_AUTOKEY) == 0) {
int track;
for (track = 0; track < context->num_tracks; ++track) {
for (track = 0; track < context->num_tracks; track++) {
if (BKE_tracking_plane_track_has_point_track(plane_track,
context->options[track].track)) {
BKE_tracking_track_plane_from_existing_motion(plane_track, context->first_frame);
source/blender/blenkernel/intern/tracking_stabilize.c
+7 -7
View File
@@ -274,10 +274,10 @@ static int search_closest_marker_index(MovieTrackingTrack *track, int ref_frame)
i = MAX2(0, i);
i = MIN2(i, end - 1);
for (; i < end - 1 && markers[i].framenr <= ref_frame; ++i) {
for (; i < end - 1 && markers[i].framenr <= ref_frame; i++) {
/* pass */
}
for (; 0 < i && markers[i].framenr > ref_frame; --i) {
for (; 0 < i && markers[i].framenr > ref_frame; i--) {
/* pass */
}
@@ -294,7 +294,7 @@ static void retrieve_next_higher_usable_frame(
while (i < end &&
(markers[i].framenr < ref_frame || is_effectively_disabled(ctx, track, &markers[i]))) {
++i;
i++;
}
if (i < end && markers[i].framenr < *next_higher) {
BLI_assert(markers[i].framenr >= ref_frame);
@@ -309,7 +309,7 @@ static void retrieve_next_lower_usable_frame(
BLI_assert(0 <= i && i < track->markersnr);
while (i >= 0 &&
(markers[i].framenr > ref_frame || is_effectively_disabled(ctx, track, &markers[i]))) {
--i;
i--;
}
if (0 <= i && markers[i].framenr > *next_lower) {
BLI_assert(markers[i].framenr <= ref_frame);
@@ -782,7 +782,7 @@ static int establish_track_initialization_order(StabContext *ctx, TrackInitOrder
if (marker != NULL && (track->flag & (TRACK_USE_2D_STAB | TRACK_USE_2D_STAB_ROT))) {
order[tracknr].sort_value = abs(marker->framenr - anchor_frame);
order[tracknr].reference_frame = marker->framenr;
++tracknr;
tracknr++;
}
}
if (tracknr) {
@@ -907,7 +907,7 @@ static void initialize_all_tracks(StabContext *ctx, float aspect)
local_data->track_weight_curve = retrieve_track_weight_animation(clip, track);
local_data->is_init_for_stabilization = false;
++track_len;
track_len++;
}
if (!track_len) {
return;
@@ -927,7 +927,7 @@ static void initialize_all_tracks(StabContext *ctx, float aspect)
average_marker_positions(ctx, reference_frame, average_pos);
setup_pivot(average_pos, pivot);
for (i = 0; i < track_len; ++i) {
for (i = 0; i < track_len; i++) {
track = order[i].data;
if (reference_frame != order[i].reference_frame) {
reference_frame = order[i].reference_frame;
source/blender/blenkernel/intern/tracking_util.c
+3 -3
View File
@@ -688,7 +688,7 @@ static ImBuf *make_grayscale_ibuf_copy(ImBuf *ibuf)
grayscale->mall |= IB_rectfloat;
grayscale->flags |= IB_rectfloat;
for (i = 0; i < grayscale->x * grayscale->y; ++i) {
for (i = 0; i < grayscale->x * grayscale->y; i++) {
const float *pixel = ibuf->rect_float + ibuf->channels * i;
grayscale->rect_float[i] = 0.2126f * pixel[0] + 0.7152f * pixel[1] + 0.0722f * pixel[2];
@@ -790,9 +790,9 @@ static ImBuf *accessor_get_ibuf(TrackingImageAccessor *accessor,
* here. Probably Libmv is better to work in the linear space,
* but keep sRGB space here for compatibility for now.
*/
for (y = 0; y < clamped_height; ++y) {
for (y = 0; y < clamped_height; y++) {
int x;
for (x = 0; x < clamped_width; ++x) {
for (x = 0; x < clamped_width; x++) {
int src_x = x + clamped_origin_x, src_y = y + clamped_origin_y;
int dst_x = x + dst_offset_x, dst_y = y + dst_offset_y;
int dst_index = (dst_y * width + dst_x) * 4,
source/blender/blenlib/intern/BLI_filelist.c
+2 -2
View File
@@ -437,7 +437,7 @@ void BLI_filelist_duplicate(struct direntry **dest_filelist,
unsigned int i;
*dest_filelist = MEM_mallocN(sizeof(**dest_filelist) * (size_t)(nrentries), __func__);
for (i = 0; i < nrentries; ++i) {
for (i = 0; i < nrentries; i++) {
struct direntry *const src = &src_filelist[i];
struct direntry *dst = &(*dest_filelist)[i];
BLI_filelist_entry_duplicate(dst, src);
@@ -463,7 +463,7 @@ void BLI_filelist_entry_free(struct direntry *entry)
void BLI_filelist_free(struct direntry *filelist, const unsigned int nrentries)
{
unsigned int i;
for (i = 0; i < nrentries; ++i) {
for (i = 0; i < nrentries; i++) {
BLI_filelist_entry_free(&filelist[i]);
}
source/blender/blenlib/intern/fileops.c
+1 -1
View File
@@ -343,7 +343,7 @@ static bool delete_recursive(const char *dir)
err = true;
}
}
++fl;
fl++;
}
if (!err && delete_unique(dir, true)) {
source/blender/blenlib/intern/hash_md5.c
+2 -2
View File
@@ -151,7 +151,7 @@ static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ct
*/
#define OP(a, b, c, d, s, T) \
a += FF(b, c, d) + (*cwp++ = SWAP(*words)) + T; \
++words; \
words++; \
CYCLIC(a, s); \
a += b; \
(void)0
@@ -408,7 +408,7 @@ char *BLI_hash_md5_to_hexdigest(void *resblock, char r_hex_digest[33])
char *q;
short len;
for (q = r_hex_digest, p = (const unsigned char *)resblock, len = 0; len < 16; ++p, ++len) {
for (q = r_hex_digest, p = (const unsigned char *)resblock, len = 0; len < 16; p++, len++) {
const unsigned char c = *p;
*q++ = hex_map[c >> 4];
*q++ = hex_map[c & 15];
source/blender/blenlib/intern/list_sort_impl.h
+2 -2
View File
@@ -240,7 +240,7 @@ BLI_INLINE void insert_list(struct SortInfo *si, list_node *list, unsigned int r
rank = MAX_RANKS;
}
list = merge_lists(sweep_up(si, NULL, si->n_ranks), list, THUNK_APPEND1(si->func, si->thunk));
for (i = si->n_ranks; i < rank; ++i) {
for (i = si->n_ranks; i < rank; i++) {
si->ranks[i] = NULL;
}
}
@@ -248,7 +248,7 @@ BLI_INLINE void insert_list(struct SortInfo *si, list_node *list, unsigned int r
if (rank) {
list = merge_lists(sweep_up(si, NULL, rank), list, THUNK_APPEND1(si->func, si->thunk));
}
for (i = rank; i < si->n_ranks && si->ranks[i]; ++i) {
for (i = rank; i < si->n_ranks && si->ranks[i]; i++) {
list = merge_lists(si->ranks[i], list, THUNK_APPEND1(si->func, si->thunk));
si->ranks[i] = NULL;
}
source/blender/blenlib/intern/math_interp.c
+2 -2
View File
@@ -687,11 +687,11 @@ void BLI_ewa_filter(const int width,
d = 0.0f;
zero_v4(result);
for (v = v1; v <= v2; ++v) {
for (v = v1; v <= v2; v++) {
const float V = (float)v - V0;
float DQ = ac1 + B * V;
float Q = (C * V + BU) * V + ac2;
for (u = u1; u <= u2; ++u) {
for (u = u1; u <= u2; u++) {
if (Q < (float)(EWA_MAXIDX + 1)) {
float tc[4];
const float wt = EWA_WTS[(Q < 0.0f) ? 0 : (unsigned int)Q];
source/blender/blenlib/intern/path_util.c
+4 -4
View File
@@ -618,14 +618,14 @@ void BLI_path_rel(char *file, const char *relfile)
*/
if (*q != '/') {
while ((q >= file) && (*q != '/')) {
--q;
--p;
q--;
p--;
}
}
else if (*p != '/') {
while ((p >= temp) && (*p != '/')) {
--p;
--q;
p--;
q--;
}
}
source/blender/blenlib/intern/string.c
+1 -1
View File
@@ -978,7 +978,7 @@ size_t BLI_str_partition_ex(const char *str,
*sep = *suf = NULL;
for (d = delim; *d != '\0'; ++d) {
for (d = delim; *d != '\0'; d++) {
const char *tmp;
if (end) {
source/blender/blenlib/intern/string_utf8.c
+5 -5
View File
@@ -716,7 +716,7 @@ size_t BLI_str_utf8_from_unicode(uint c, char *outbuf)
}
if (outbuf) {
for (i = len - 1; i > 0; --i) {
for (i = len - 1; i > 0; i--) {
outbuf[i] = (c & 0x3f) | 0x80;
c >>= 6;
}
@@ -744,7 +744,7 @@ size_t BLI_str_utf8_from_unicode(uint c, char *outbuf)
*/
char *BLI_str_find_prev_char_utf8(const char *str, const char *p)
{
for (--p; p >= str; --p) {
for (--p; p >= str; p--) {
if ((*p & 0xc0) != 0x80) {
return (char *)p;
}
@@ -771,12 +771,12 @@ char *BLI_str_find_next_char_utf8(const char *p, const char *end)
{
if (*p) {
if (end) {
for (++p; p < end && (*p & 0xc0) == 0x80; ++p) {
for (++p; p < end && (*p & 0xc0) == 0x80; p++) {
/* do nothing */
}
}
else {
for (++p; (*p & 0xc0) == 0x80; ++p) {
for (++p; (*p & 0xc0) == 0x80; p++) {
/* do nothing */
}
}
@@ -852,7 +852,7 @@ size_t BLI_str_partition_ex_utf8(const char *str,
break;
}
for (d = delim; *d != '\0'; ++d) {
for (d = delim; *d != '\0'; d++) {
if (*d == c) {
/* *suf is already correct in case from_right is true. */
if (!from_right) {
source/blender/blenlib/intern/task.c
+8 -8
View File
@@ -266,7 +266,7 @@ BLI_INLINE TaskThreadLocalStorage *get_task_tls(TaskPool *pool, const int thread
BLI_INLINE void free_task_tls(TaskThreadLocalStorage *tls)
{
TaskMemPool *task_mempool = &tls->task_mempool;
for (int i = 0; i < task_mempool->num_tasks; ++i) {
for (int i = 0; i < task_mempool->num_tasks; i++) {
MEM_freeN(task_mempool->tasks[i]);
}
}
@@ -561,7 +561,7 @@ void BLI_task_scheduler_free(TaskScheduler *scheduler)
/* Delete task thread data */
if (scheduler->task_threads) {
for (int i = 0; i < scheduler->num_threads + 1; ++i) {
for (int i = 0; i < scheduler->num_threads + 1; i++) {
TaskThreadLocalStorage *tls = &scheduler->task_threads[i].tls;
free_task_tls(tls);
}
@@ -777,7 +777,7 @@ void BLI_task_pool_free(TaskPool *pool)
#ifdef DEBUG_STATS
printf("Thread ID Allocated Reused Discarded\n");
for (int i = 0; i < pool->scheduler->num_threads + 1; ++i) {
for (int i = 0; i < pool->scheduler->num_threads + 1; i++) {
printf("%02d %05d %05d %05d\n",
i,
pool->mempool_stats[i].num_alloc,
@@ -1116,7 +1116,7 @@ static void parallel_range_func(TaskPool *__restrict pool, void *userdata_chunk,
};
int iter, count;
while (parallel_range_next_iter_get(state, &iter, &count)) {
for (int i = 0; i < count; ++i) {
for (int i = 0; i < count; i++) {
state->func(state->userdata, iter + i, &tls);
}
}
@@ -1140,7 +1140,7 @@ static void parallel_range_single_thread(const int start,
.thread_id = 0,
.userdata_chunk = userdata_chunk_local,
};
for (int i = start; i < stop; ++i) {
for (int i = start; i < stop; i++) {
func(userdata, i, &tls);
}
if (settings->func_finalize != NULL) {
@@ -1273,7 +1273,7 @@ BLI_INLINE Link *parallel_listbase_next_iter_get(ParallelListState *__restrict s
if (LIKELY(result != NULL)) {
*index = state->index;
while (state->link != NULL && task_count < state->chunk_size) {
++task_count;
task_count++;
state->link = state->link->next;
}
state->index += task_count;
@@ -1292,7 +1292,7 @@ static void parallel_listbase_func(TaskPool *__restrict pool,
int index, count;
while ((link = parallel_listbase_next_iter_get(state, &index, &count)) != NULL) {
for (int i = 0; i < count; ++i) {
for (int i = 0; i < count; i++) {
state->func(state->userdata, link, index + i);
link = link->next;
}
@@ -1304,7 +1304,7 @@ static void task_parallel_listbase_no_threads(struct ListBase *listbase,
TaskParallelListbaseFunc func)
{
int i = 0;
for (Link *link = listbase->first; link != NULL; link = link->next, ++i) {
for (Link *link = listbase->first; link != NULL; link = link->next, i++) {
func(userdata, link, i);
}
}
source/blender/blenloader/intern/readfile.c
+4 -4
View File
@@ -2597,7 +2597,7 @@ static PreviewImage *direct_link_preview_image(FileData *fd, PreviewImage *old_p
if (prv) {
int i;
for (i = 0; i < NUM_ICON_SIZES; ++i) {
for (i = 0; i < NUM_ICON_SIZES; i++) {
if (prv->rect[i]) {
prv->rect[i] = newdataadr(fd, prv->rect[i]);
}
@@ -4938,7 +4938,7 @@ static void direct_link_mdisps(FileData *fd, int count, MDisps *mdisps, int exte
if (mdisps) {
int i;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
mdisps[i].disps = newdataadr(fd, mdisps[i].disps);
mdisps[i].hidden = newdataadr(fd, mdisps[i].hidden);
@@ -4968,7 +4968,7 @@ static void direct_link_grid_paint_mask(FileData *fd, int count, GridPaintMask *
if (grid_paint_mask) {
int i;
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
GridPaintMask *gpm = &grid_paint_mask[i];
if (gpm->data) {
gpm->data = newdataadr(fd, gpm->data);
@@ -6344,7 +6344,7 @@ static void direct_link_lightcache(FileData *fd, LightCache *cache)
if (cache->cube_mips) {
cache->cube_mips = newdataadr(fd, cache->cube_mips);
for (int i = 0; i < cache->mips_len; ++i) {
for (int i = 0; i < cache->mips_len; i++) {
direct_link_lightcache_texture(fd, &cache->cube_mips[i]);
}
}
source/blender/blenloader/intern/versioning_260.c
+2 -2
View File
@@ -2608,7 +2608,7 @@ void do_versions_after_linking_260(Main *bmain)
if (input_node) {
link->fromnode = input_node;
link->fromsock = node_group_input_find_socket(input_node, link->fromsock->identifier);
++num_inputs;
num_inputs++;
if (link->tonode) {
if (input_locx > link->tonode->locx - offsetx) {
@@ -2626,7 +2626,7 @@ void do_versions_after_linking_260(Main *bmain)
if (output_node) {
link->tonode = output_node;
link->tosock = node_group_output_find_socket(output_node, link->tosock->identifier);
++num_outputs;
num_outputs++;
if (link->fromnode) {
if (output_locx < link->fromnode->locx + offsetx) {
source/blender/blenloader/intern/versioning_280.c
+1 -1
View File
@@ -1454,7 +1454,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
ToolSettings *ts = scene->toolsettings;
/* sculpt brushes */
GP_Sculpt_Settings *gset = &ts->gp_sculpt;
for (int i = 0; i < GP_SCULPT_TYPE_MAX; ++i) {
for (int i = 0; i < GP_SCULPT_TYPE_MAX; i++) {
gp_brush = &gset->brush[i];
gp_brush->flag |= GP_SCULPT_FLAG_ENABLE_CURSOR;
copy_v3_v3(gp_brush->curcolor_add, curcolor_add);
source/blender/blenloader/intern/writefile.c
+3 -3
View File
@@ -2014,7 +2014,7 @@ static void write_mdisps(WriteData *wd, int count, MDisps *mdlist, int external)
int i;
writestruct(wd, DATA, MDisps, count, mdlist);
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
MDisps *md = &mdlist[i];
if (md->disps) {
if (!external) {
@@ -2035,7 +2035,7 @@ static void write_grid_paint_mask(WriteData *wd, int count, GridPaintMask *grid_
int i;
writestruct(wd, DATA, GridPaintMask, count, grid_paint_mask);
for (i = 0; i < count; ++i) {
for (i = 0; i < count; i++) {
GridPaintMask *gpm = &grid_paint_mask[i];
if (gpm->data) {
const int gridsize = BKE_ccg_gridsize(gpm->level);
@@ -2471,7 +2471,7 @@ static void write_lightcache(WriteData *wd, LightCache *cache)
if (cache->cube_mips) {
writestruct(wd, DATA, LightCacheTexture, cache->mips_len, cache->cube_mips);
for (int i = 0; i < cache->mips_len; ++i) {
for (int i = 0; i < cache->mips_len; i++) {
write_lightcache_texture(wd, &cache->cube_mips[i]);
}
}
source/blender/collada/AnimationExporter.cpp
+4 -4
View File
@@ -100,7 +100,7 @@ bool AnimationExporter::exportAnimations()
openLibrary();
BCObjectSet::iterator it;
for (it = animated_subset.begin(); it != animated_subset.end(); ++it) {
for (it = animated_subset.begin(); it != animated_subset.end(); it++) {
Object *ob = *it;
exportAnimation(ob, animation_sampler);
}
@@ -183,7 +183,7 @@ void AnimationExporter::export_curve_animation_set(Object *ob,
bool keep_flat_curves = this->export_settings.get_keep_flat_curves();
BCAnimationCurveMap::iterator it;
for (it = curves->begin(); it != curves->end(); ++it) {
for (it = curves->begin(); it != curves->end(); it++) {
BCAnimationCurve &curve = *it->second;
std::string channel_type = curve.get_channel_type();
if (channel_type == "rotation_quaternion") {
@@ -310,7 +310,7 @@ BCAnimationCurve *AnimationExporter::get_modified_export_curve(Object *ob,
}
BCValueMap::const_iterator vit;
for (vit = lens_values.begin(); vit != lens_values.end(); ++vit) {
for (vit = lens_values.begin(); vit != lens_values.end(); vit++) {
int frame = vit->first;
float lens_value = vit->second;
@@ -594,7 +594,7 @@ std::string AnimationExporter::collada_tangent_from_curve(
const FCurve *fcu = curve.get_fcurve();
int tangent = (semantic == COLLADASW::InputSemantic::IN_TANGENT) ? 0 : 2;
for (int i = 0; i < fcu->totvert; ++i) {
for (int i = 0; i < fcu->totvert; i++) {
BezTriple &bezt = fcu->bezt[i];
float sampled_time = bezt.vec[tangent][0];
source/blender/collada/BCAnimationCurve.cpp
+2 -2
View File
@@ -249,7 +249,7 @@ const int BCAnimationCurve::closest_index_below(const float sample_frame) const
int lower_index = 0;
int upper_index = 0;
for (int fcu_index = 0; fcu_index < fcurve->totvert; ++fcu_index) {
for (int fcu_index = 0; fcu_index < fcurve->totvert; fcu_index++) {
upper_index = fcu_index;
const int cframe = fcurve->bezt[fcu_index].vec[1][0]; // inacurate!
@@ -537,7 +537,7 @@ bool BCAnimationCurve::is_keyframe(int frame)
return false;
}
for (int i = 0; i < fcurve->totvert; ++i) {
for (int i = 0; i < fcurve->totvert; i++) {
const int cframe = nearbyint(fcurve->bezt[i].vec[1][0]);
if (cframe == frame) {
return true;
source/blender/collada/BCAnimationSampler.cpp
+14 -14
View File
@@ -49,7 +49,7 @@ BCAnimationSampler::BCAnimationSampler(BCExportSettings &export_settings, BCObje
: export_settings(export_settings)
{
BCObjectSet::iterator it;
for (it = object_set.begin(); it != object_set.end(); ++it) {
for (it = object_set.begin(); it != object_set.end(); it++) {
Object *ob = *it;
add_object(ob);
}
@@ -58,7 +58,7 @@ BCAnimationSampler::BCAnimationSampler(BCExportSettings &export_settings, BCObje
BCAnimationSampler::~BCAnimationSampler()
{
BCAnimationObjectMap::iterator it;
for (it = objects.begin(); it != objects.end(); ++it) {
for (it = objects.begin(); it != objects.end(); it++) {
BCAnimation *animation = it->second;
delete animation;
}
@@ -129,7 +129,7 @@ static void add_keyframes_from(bAction *action, BCFrameSet &frameset)
void BCAnimationSampler::check_property_is_animated(
BCAnimation &animation, float *ref, float *val, std::string data_path, int length)
{
for (int array_index = 0; array_index < length; ++array_index) {
for (int array_index = 0; array_index < length; array_index++) {
if (!bc_in_range(ref[length], val[length], 0.00001)) {
BCCurveKey key(BC_ANIMATION_TYPE_OBJECT, data_path, array_index);
BCAnimationCurveMap::iterator it = animation.curve_map.find(key);
@@ -146,7 +146,7 @@ void BCAnimationSampler::update_animation_curves(BCAnimation &animation,
int frame)
{
BCAnimationCurveMap::iterator it;
for (it = animation.curve_map.begin(); it != animation.curve_map.end(); ++it) {
for (it = animation.curve_map.begin(); it != animation.curve_map.end(); it++) {
BCAnimationCurve *curve = it->second;
if (curve->is_transform_curve()) {
curve->add_value_from_matrix(sample, frame);
@@ -195,7 +195,7 @@ void BCAnimationSampler::sample_scene(BCExportSettings &export_settings, bool ke
int startframe = scene->r.sfra;
int endframe = scene->r.efra;
for (int frame_index = startframe; frame_index <= endframe; ++frame_index) {
for (int frame_index = startframe; frame_index <= endframe; frame_index++) {
/* Loop over all frames and decide for each frame if sampling is necessary */
bool is_scene_sample_frame = false;
bool needs_update = true;
@@ -212,7 +212,7 @@ void BCAnimationSampler::sample_scene(BCExportSettings &export_settings, bool ke
}
BCAnimationObjectMap::iterator obit;
for (obit = objects.begin(); obit != objects.end(); ++obit) {
for (obit = objects.begin(); obit != objects.end(); obit++) {
Object *ob = obit->first;
BCAnimation *animation = obit->second;
BCFrameSet &object_keyframes = animation->frame_set;
@@ -268,7 +268,7 @@ void BCAnimationSampler::find_depending_animated(std::set<Object *> &animated_ob
do {
found_more = false;
std::set<Object *>::iterator it;
for (it = candidates.begin(); it != candidates.end(); ++it) {
for (it = candidates.begin(); it != candidates.end(); it++) {
Object *cob = *it;
ListBase *conlist = get_active_constraints(cob);
if (is_animated_by_constraint(cob, conlist, animated_objects)) {
@@ -353,7 +353,7 @@ void BCAnimationSampler::add_value_set(BCAnimationCurve &curve,
const BC_animation_transform_type tm_type = curve.get_transform_type();
BCFrameSampleMap::iterator it;
for (it = samples.begin(); it != samples.end(); ++it) {
for (it = samples.begin(); it != samples.end(); it++) {
const int frame_index = nearbyint(it->first);
if (animation_type == BC_ANIMATION_EXPORT_SAMPLES || curve.is_keyframe(frame_index)) {
@@ -585,7 +585,7 @@ const int BCSampleFrameContainer::get_frames(std::vector<int> &frames) const
{
frames.clear(); // safety;
BCSampleFrameMap::const_iterator it;
for (it = sample_frames.begin(); it != sample_frames.end(); ++it) {
for (it = sample_frames.begin(); it != sample_frames.end(); it++) {
frames.push_back(it->first);
}
return frames.size();
@@ -595,7 +595,7 @@ const int BCSampleFrameContainer::get_frames(Object *ob, BCFrames &frames) const
{
frames.clear(); // safety;
BCSampleFrameMap::const_iterator it;
for (it = sample_frames.begin(); it != sample_frames.end(); ++it) {
for (it = sample_frames.begin(); it != sample_frames.end(); it++) {
const BCSampleFrame &frame = it->second;
if (frame.has_sample_for(ob)) {
frames.push_back(it->first);
@@ -608,7 +608,7 @@ const int BCSampleFrameContainer::get_frames(Object *ob, Bone *bone, BCFrames &f
{
frames.clear(); // safety;
BCSampleFrameMap::const_iterator it;
for (it = sample_frames.begin(); it != sample_frames.end(); ++it) {
for (it = sample_frames.begin(); it != sample_frames.end(); it++) {
const BCSampleFrame &frame = it->second;
if (frame.has_sample_for(ob, bone)) {
frames.push_back(it->first);
@@ -621,7 +621,7 @@ const int BCSampleFrameContainer::get_samples(Object *ob, BCFrameSampleMap &samp
{
samples.clear(); // safety;
BCSampleFrameMap::const_iterator it;
for (it = sample_frames.begin(); it != sample_frames.end(); ++it) {
for (it = sample_frames.begin(); it != sample_frames.end(); it++) {
const BCSampleFrame &frame = it->second;
const BCSample *sample = frame.get_sample(ob);
if (sample) {
@@ -635,7 +635,7 @@ const int BCSampleFrameContainer::get_matrices(Object *ob, BCMatrixSampleMap &sa
{
samples.clear(); // safety;
BCSampleFrameMap::const_iterator it;
for (it = sample_frames.begin(); it != sample_frames.end(); ++it) {
for (it = sample_frames.begin(); it != sample_frames.end(); it++) {
const BCSampleFrame &frame = it->second;
const BCMatrix *matrix = frame.get_sample_matrix(ob);
if (matrix) {
@@ -651,7 +651,7 @@ const int BCSampleFrameContainer::get_matrices(Object *ob,
{
samples.clear(); // safety;
BCSampleFrameMap::const_iterator it;
for (it = sample_frames.begin(); it != sample_frames.end(); ++it) {
for (it = sample_frames.begin(); it != sample_frames.end(); it++) {
const BCSampleFrame &frame = it->second;
const BCMatrix *sample = frame.get_sample_matrix(ob, bone);
if (sample) {
source/blender/collada/BCAnimationSampler.h
+2 -2
View File
@@ -47,7 +47,7 @@ class BCAnimation {
~BCAnimation()
{
BCAnimationCurveMap::iterator it;
for (it = curve_map.begin(); it != curve_map.end(); ++it) {
for (it = curve_map.begin(); it != curve_map.end(); it++) {
delete it->second;
}
@@ -79,7 +79,7 @@ class BCSampleFrame {
~BCSampleFrame()
{
BCSampleMap::iterator it;
for (it = sampleMap.begin(); it != sampleMap.end(); ++it) {
for (it = sampleMap.begin(); it != sampleMap.end(); it++) {
BCSample *sample = it->second;
delete sample;
}
source/blender/collada/BCSampleData.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
BCSample::~BCSample()
{
BCBoneMatrixMap::iterator it;
for (it = bonemats.begin(); it != bonemats.end(); ++it) {
for (it = bonemats.begin(); it != bonemats.end(); it++) {
delete it->second;
}
}
@@ -50,7 +50,7 @@ const bool BCSample::get_value(std::string channel_target, const int array_index
bname = bname.substr(2);
bname = bc_string_before(bname, "\"");
BCBoneMatrixMap::const_iterator it;
for (it = bonemats.begin(); it != bonemats.end(); ++it) {
for (it = bonemats.begin(); it != bonemats.end(); it++) {
Bone *bone = it->first;
if (bname == bone->name) {
matrix = it->second;
source/blender/collada/ControllerExporter.cpp
+3 -3
View File
@@ -265,7 +265,7 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm)
if (sumw > 0.0f) {
float invsumw = 1.0f / sumw;
vcounts.push_back(jw.size());
for (std::map<int, float>::iterator m = jw.begin(); m != jw.end(); ++m) {
for (std::map<int, float>::iterator m = jw.begin(); m != jw.end(); m++) {
joints.push_back((*m).first);
weights.push_back(invsumw * (*m).second);
}
@@ -616,7 +616,7 @@ std::string ControllerExporter::add_weights_source(Mesh *me,
source.prepareToAppendValues();
for (std::list<float>::const_iterator i = weights.begin(); i != weights.end(); ++i) {
for (std::list<float>::const_iterator i = weights.begin(); i != weights.end(); i++) {
source.appendValues(*i);
}
@@ -658,7 +658,7 @@ void ControllerExporter::add_vertex_weights_element(const std::string &weights_s
/* write deformer index - weight index pairs */
int weight_index = 0;
for (std::list<int>::const_iterator i = joints.begin(); i != joints.end(); ++i) {
for (std::list<int>::const_iterator i = joints.begin(); i != joints.end(); i++) {
weightselem.appendValues(*i, weight_index++);
}
source/blender/collada/DocumentImporter.cpp
+6 -6
View File
@@ -333,7 +333,7 @@ std::string DocumentImporter::get_import_version(const COLLADAFW::FileInfo *asse
const char AUTORING_TOOL[] = "authoring_tool";
const std::string BLENDER("Blender ");
const COLLADAFW::FileInfo::ValuePairPointerArray &valuePairs = asset->getValuePairArray();
for (size_t i = 0, count = valuePairs.getCount(); i < count; ++i) {
for (size_t i = 0, count = valuePairs.getCount(); i < count; i++) {
const COLLADAFW::FileInfo::ValuePair *valuePair = valuePairs[i];
const COLLADAFW::String &key = valuePair->first;
const COLLADAFW::String &value = valuePair->second;
@@ -567,7 +567,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
root_objects->push_back(ob);
}
}
++geom_done;
geom_done++;
}
while (camera_done < camera.getCount()) {
ob = create_camera_object(camera[camera_done], sce);
@@ -580,7 +580,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
root_objects->push_back(ob);
}
}
++camera_done;
camera_done++;
}
while (lamp_done < lamp.getCount()) {
ob = create_light_object(lamp[lamp_done], sce);
@@ -593,7 +593,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
root_objects->push_back(ob);
}
}
++lamp_done;
lamp_done++;
}
while (controller_done < controller.getCount()) {
COLLADAFW::InstanceGeometry *geometry = (COLLADAFW::InstanceGeometry *)
@@ -608,7 +608,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
root_objects->push_back(ob);
}
}
++controller_done;
controller_done++;
}
/* XXX instance_node is not supported yet */
while (inst_done < inst_node.getCount()) {
@@ -635,7 +635,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
}
}
}
++inst_done;
inst_done++;
read_transform = false;
}
source/blender/collada/SceneExporter.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ void SceneExporter::writeNodeList(std::vector<Object *> &child_objects, Object *
* I really prefer to enforce the export of hidden
* elements in an object hierarchy. When the children of
* the hidden elements are exported as well. */
for (int i = 0; i < child_objects.size(); ++i) {
for (int i = 0; i < child_objects.size(); i++) {
Object *child = child_objects[i];
writeNode(child);
if (bc_is_marked(child)) {
source/blender/collada/collada_utils.cpp
+2 -2
View File
@@ -525,7 +525,7 @@ BoneExtensionMap &BoneExtensionManager::getExtensionMap(bArmature *armature)
BoneExtensionManager::~BoneExtensionManager()
{
std::map<std::string, BoneExtensionMap *>::iterator map_it;
for (map_it = extended_bone_maps.begin(); map_it != extended_bone_maps.end(); ++map_it) {
for (map_it = extended_bone_maps.begin(); map_it != extended_bone_maps.end(); map_it++) {
BoneExtensionMap *extended_bones = map_it->second;
for (BoneExtensionMap::iterator ext_it = extended_bones->begin();
ext_it != extended_bones->end();
@@ -916,7 +916,7 @@ bool bc_is_animated(BCMatrixSampleMap &values)
BCMatrixSampleMap::iterator it;
const BCMatrix *refmat = NULL;
for (it = values.begin(); it != values.end(); ++it) {
for (it = values.begin(); it != values.end(); it++) {
const BCMatrix *matrix = it->second;
if (refmat == NULL) {
source/blender/compositor/intern/COM_Debug.cpp
+7 -7
View File
@@ -335,7 +335,7 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
int totops = system->m_operations.size();
int totgroups = system->m_groups.size();
std::map<NodeOperation *, std::vector<std::string>> op_groups;
for (int i = 0; i < totgroups; ++i) {
for (int i = 0; i < totgroups; i++) {
const ExecutionGroup *group = system->m_groups[i];
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "// GROUP: %d\r\n", i);
@@ -377,7 +377,7 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
}
/* operations not included in any group */
for (int j = 0; j < totops; ++j) {
for (int j = 0; j < totops; j++) {
NodeOperation *operation = system->m_operations[j];
if (op_groups.find(operation) != op_groups.end()) {
continue;
@@ -397,8 +397,8 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
std::vector<std::string> &read_groups = op_groups[read];
std::vector<std::string> &write_groups = op_groups[write];
for (int k = 0; k < write_groups.size(); ++k) {
for (int l = 0; l < read_groups.size(); ++l) {
for (int k = 0; k < write_groups.size(); k++) {
for (int l = 0; l < read_groups.size(); l++) {
len += snprintf(str + len,
maxlen > len ? maxlen - len : 0,
"\"O_%p%s\" -> \"O_%p%s\" [style=dotted]\r\n",
@@ -448,8 +448,8 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
from,
to_op,
to);
for (int k = 0; k < from_groups.size(); ++k) {
for (int l = 0; l < to_groups.size(); ++l) {
for (int k = 0; k < from_groups.size(); k++) {
for (int l = 0; l < to_groups.size(); l++) {
len += snprintf(str + len,
maxlen > len ? maxlen - len : 0,
"\"O_%p%s\":\"OUT_%p\":e -> \"O_%p%s\":\"IN_%p\":w",
@@ -483,7 +483,7 @@ void DebugInfo::graphviz(const ExecutionSystem *system)
BLI_snprintf(basename, sizeof(basename), "compositor_%d.dot", m_file_index);
BLI_join_dirfile(filename, sizeof(filename), BKE_tempdir_session(), basename);
++m_file_index;
m_file_index++;
FILE *fp = BLI_fopen(filename, "wb");
fputs(str, fp);
source/blender/compositor/intern/COM_NodeGraph.cpp
+3 -3
View File
@@ -160,7 +160,7 @@ void NodeGraph::add_bNode(const CompositorContext &context,
NodeGraph::NodeInputs NodeGraph::find_inputs(const NodeRange &node_range, bNodeSocket *b_socket)
{
NodeInputs result;
for (NodeGraph::NodeIterator it = node_range.first; it != node_range.second; ++it) {
for (NodeGraph::NodeIterator it = node_range.first; it != node_range.second; it++) {
Node *node = *it;
for (int index = 0; index < node->getNumberOfInputSockets(); index++) {
NodeInput *input = node->getInputSocket(index);
@@ -174,7 +174,7 @@ NodeGraph::NodeInputs NodeGraph::find_inputs(const NodeRange &node_range, bNodeS
NodeOutput *NodeGraph::find_output(const NodeRange &node_range, bNodeSocket *b_socket)
{
for (NodeGraph::NodeIterator it = node_range.first; it != node_range.second; ++it) {
for (NodeGraph::NodeIterator it = node_range.first; it != node_range.second; it++) {
Node *node = *it;
for (int index = 0; index < node->getNumberOfOutputSockets(); index++) {
NodeOutput *output = node->getOutputSocket(index);
@@ -206,7 +206,7 @@ void NodeGraph::add_bNodeLink(const NodeRange &node_range, bNodeLink *b_nodelink
}
NodeInputs inputs = find_inputs(node_range, b_nodelink->tosock);
for (NodeInputs::const_iterator it = inputs.begin(); it != inputs.end(); ++it) {
for (NodeInputs::const_iterator it = inputs.begin(); it != inputs.end(); it++) {
NodeInput *input = *it;
if (input->isLinked()) {
continue;
source/blender/compositor/intern/COM_NodeOperation.cpp
+1 -1
View File
@@ -152,7 +152,7 @@ NodeOperation *NodeOperation::getInputOperation(unsigned int inputSocketIndex)
void NodeOperation::getConnectedInputSockets(Inputs *sockets)
{
for (Inputs::const_iterator it = m_inputs.begin(); it != m_inputs.end(); ++it) {
for (Inputs::const_iterator it = m_inputs.begin(); it != m_inputs.end(); it++) {
NodeOperationInput *input = *it;
if (input->isConnected()) {
sockets->push_back(input);
source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+27 -27
View File
@@ -70,7 +70,7 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system)
* so multiple operations can use the same node input.
*/
OpInputInverseMap inverse_input_map;
for (InputSocketMap::const_iterator it = m_input_map.begin(); it != m_input_map.end(); ++it) {
for (InputSocketMap::const_iterator it = m_input_map.begin(); it != m_input_map.end(); it++) {
inverse_input_map[it->second].push_back(it->first);
}
@@ -92,7 +92,7 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system)
continue;
}
for (OpInputs::const_iterator it = op_to_list.begin(); it != op_to_list.end(); ++it) {
for (OpInputs::const_iterator it = op_to_list.begin(); it != op_to_list.end(); it++) {
NodeOperationInput *op_to = *it;
addLink(op_from, op_to);
}
@@ -166,7 +166,7 @@ void NodeOperationBuilder::addLink(NodeOperationOutput *from, NodeOperationInput
void NodeOperationBuilder::removeInputLink(NodeOperationInput *to)
{
for (Links::iterator it = m_links.begin(); it != m_links.end(); ++it) {
for (Links::iterator it = m_links.begin(); it != m_links.end(); it++) {
Link &link = *it;
if (link.to() == to) {
/* unregister with the input */
@@ -274,7 +274,7 @@ void NodeOperationBuilder::registerViewer(ViewerOperation *viewer)
void NodeOperationBuilder::add_datatype_conversions()
{
Links convert_links;
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
/* proxy operations can skip data type conversion */
@@ -288,7 +288,7 @@ void NodeOperationBuilder::add_datatype_conversions()
convert_links.push_back(link);
}
}
for (Links::const_iterator it = convert_links.begin(); it != convert_links.end(); ++it) {
for (Links::const_iterator it = convert_links.begin(); it != convert_links.end(); it++) {
const Link &link = *it;
NodeOperation *converter = Converter::convertDataType(link.from(), link.to());
if (converter) {
@@ -308,16 +308,16 @@ void NodeOperationBuilder::add_operation_input_constants()
*/
typedef std::vector<NodeOperationInput *> Inputs;
Inputs pending_inputs;
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
for (int k = 0; k < op->getNumberOfInputSockets(); ++k) {
for (int k = 0; k < op->getNumberOfInputSockets(); k++) {
NodeOperationInput *input = op->getInputSocket(k);
if (!input->isConnected()) {
pending_inputs.push_back(input);
}
}
}
for (Inputs::const_iterator it = pending_inputs.begin(); it != pending_inputs.end(); ++it) {
for (Inputs::const_iterator it = pending_inputs.begin(); it != pending_inputs.end(); it++) {
NodeOperationInput *input = *it;
add_input_constant_value(input, find_node_input(m_input_map, input));
}
@@ -378,7 +378,7 @@ void NodeOperationBuilder::add_input_constant_value(NodeOperationInput *input,
void NodeOperationBuilder::resolve_proxies()
{
Links proxy_links;
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
/* don't replace links from proxy to proxy, since we may need them for replacing others! */
if (link.from()->getOperation().isProxyOperation() &&
@@ -387,7 +387,7 @@ void NodeOperationBuilder::resolve_proxies()
}
}
for (Links::const_iterator it = proxy_links.begin(); it != proxy_links.end(); ++it) {
for (Links::const_iterator it = proxy_links.begin(); it != proxy_links.end(); it++) {
const Link &link = *it;
NodeOperationInput *to = link.to();
@@ -410,7 +410,7 @@ void NodeOperationBuilder::resolve_proxies()
void NodeOperationBuilder::determineResolutions()
{
/* determine all resolutions of the operations (Width/Height) */
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
if (op->isOutputOperation(m_context->isRendering()) && !op->isPreviewOperation()) {
@@ -421,7 +421,7 @@ void NodeOperationBuilder::determineResolutions()
}
}
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
if (op->isOutputOperation(m_context->isRendering()) && op->isPreviewOperation()) {
@@ -435,7 +435,7 @@ void NodeOperationBuilder::determineResolutions()
/* add convert resolution operations when needed */
{
Links convert_links;
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
if (link.to()->getResizeMode() != COM_SC_NO_RESIZE) {
@@ -446,7 +446,7 @@ void NodeOperationBuilder::determineResolutions()
}
}
}
for (Links::const_iterator it = convert_links.begin(); it != convert_links.end(); ++it) {
for (Links::const_iterator it = convert_links.begin(); it != convert_links.end(); it++) {
const Link &link = *it;
Converter::convertResolution(*this, link.from(), link.to());
}
@@ -457,7 +457,7 @@ NodeOperationBuilder::OpInputs NodeOperationBuilder::cache_output_links(
NodeOperationOutput *output) const
{
OpInputs inputs;
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
if (link.from() == output) {
inputs.push_back(link.to());
@@ -469,7 +469,7 @@ NodeOperationBuilder::OpInputs NodeOperationBuilder::cache_output_links(
WriteBufferOperation *NodeOperationBuilder::find_attached_write_buffer_operation(
NodeOperationOutput *output) const
{
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
if (link.from() == output) {
NodeOperation &op = link.to()->getOperation();
@@ -529,7 +529,7 @@ void NodeOperationBuilder::add_output_buffers(NodeOperation *operation,
}
WriteBufferOperation *writeOperation = NULL;
for (OpInputs::const_iterator it = targets.begin(); it != targets.end(); ++it) {
for (OpInputs::const_iterator it = targets.begin(); it != targets.end(); it++) {
NodeOperationInput *target = *it;
/* try to find existing write buffer operation */
@@ -555,7 +555,7 @@ void NodeOperationBuilder::add_output_buffers(NodeOperation *operation,
writeOperation->readResolutionFromInputSocket();
/* add readbuffer op for every former connected input */
for (OpInputs::const_iterator it = targets.begin(); it != targets.end(); ++it) {
for (OpInputs::const_iterator it = targets.begin(); it != targets.end(); it++) {
NodeOperationInput *target = *it;
if (&target->getOperation() == writeOperation) {
continue; /* skip existing write op links */
@@ -578,13 +578,13 @@ void NodeOperationBuilder::add_complex_operation_buffers()
* will invalidate iterators over the main m_operations
*/
Operations complex_ops;
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
if ((*it)->isComplex()) {
complex_ops.push_back(*it);
}
}
for (Operations::const_iterator it = complex_ops.begin(); it != complex_ops.end(); ++it) {
for (Operations::const_iterator it = complex_ops.begin(); it != complex_ops.end(); it++) {
NodeOperation *op = *it;
DebugInfo::operation_read_write_buffer(op);
@@ -608,7 +608,7 @@ static void find_reachable_operations_recursive(Tags &reachable, NodeOperation *
}
reachable.insert(op);
for (int i = 0; i < op->getNumberOfInputSockets(); ++i) {
for (int i = 0; i < op->getNumberOfInputSockets(); i++) {
NodeOperationInput *input = op->getInputSocket(i);
if (input->isConnected()) {
find_reachable_operations_recursive(reachable, &input->getLink()->getOperation());
@@ -626,7 +626,7 @@ static void find_reachable_operations_recursive(Tags &reachable, NodeOperation *
void NodeOperationBuilder::prune_operations()
{
Tags reachable;
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
/* output operations are primary executed operations */
@@ -637,7 +637,7 @@ void NodeOperationBuilder::prune_operations()
/* delete unreachable operations */
Operations reachable_ops;
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
if (reachable.find(op) != reachable.end()) {
@@ -661,7 +661,7 @@ static void sort_operations_recursive(NodeOperationBuilder::Operations &sorted,
}
visited.insert(op);
for (int i = 0; i < op->getNumberOfInputSockets(); ++i) {
for (int i = 0; i < op->getNumberOfInputSockets(); i++) {
NodeOperationInput *input = op->getInputSocket(i);
if (input->isConnected()) {
sort_operations_recursive(sorted, visited, &input->getLink()->getOperation());
@@ -677,7 +677,7 @@ void NodeOperationBuilder::sort_operations()
sorted.reserve(m_operations.size());
Tags visited;
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
sort_operations_recursive(sorted, visited, *it);
}
@@ -696,7 +696,7 @@ static void add_group_operations_recursive(Tags &visited, NodeOperation *op, Exe
}
/* add all eligible input ops to the group */
for (int i = 0; i < op->getNumberOfInputSockets(); ++i) {
for (int i = 0; i < op->getNumberOfInputSockets(); i++) {
NodeOperationInput *input = op->getInputSocket(i);
if (input->isConnected()) {
add_group_operations_recursive(visited, &input->getLink()->getOperation(), group);
@@ -717,7 +717,7 @@ ExecutionGroup *NodeOperationBuilder::make_group(NodeOperation *op)
void NodeOperationBuilder::group_operations()
{
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
if (op->isOutputOperation(m_context->isRendering())) {
source/blender/compositor/nodes/COM_CornerPinNode.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ void CornerPinNode::convertToOperations(NodeConverter &converter,
converter.addOperation(plane_mask_operation);
converter.mapInputSocket(input_image, warp_image_operation->getInputSocket(0));
for (int i = 0; i < 4; ++i) {
for (int i = 0; i < 4; i++) {
NodeInput *corner_input = getInputSocket(node_corner_index[i]);
converter.mapInputSocket(corner_input, warp_image_operation->getInputSocket(i + 1));
converter.mapInputSocket(corner_input, plane_mask_operation->getInputSocket(i));
source/blender/compositor/nodes/COM_CryptomatteNode.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ void CryptomatteNode::convertToOperations(NodeConverter &converter,
converter.addOperation(operation);
for (int i = 0; i < getNumberOfInputSockets() - 1; ++i) {
for (int i = 0; i < getNumberOfInputSockets() - 1; i++) {
converter.mapInputSocket(this->getInputSocket(i + 1), operation->getInputSocket(i));
}
source/blender/compositor/nodes/COM_ImageNode.cpp
+1 -1
View File
@@ -206,7 +206,7 @@ void ImageNode::convertToOperations(NodeConverter &converter,
/* without this, multilayer that fail to load will crash blender [#32490] */
if (is_multilayer_ok == false) {
for (int i = 0; i < getNumberOfOutputSockets(); ++i) {
for (int i = 0; i < getNumberOfOutputSockets(); i++) {
converter.setInvalidOutput(getOutputSocket(i));
}
}
source/blender/compositor/nodes/COM_OutputFileNode.cpp
+2 -2
View File
@@ -69,7 +69,7 @@ void OutputFileNode::convertToOperations(NodeConverter &converter,
int num_inputs = getNumberOfInputSockets();
bool previewAdded = false;
for (int i = 0; i < num_inputs; ++i) {
for (int i = 0; i < num_inputs; i++) {
NodeInput *input = getInputSocket(i);
NodeImageMultiFileSocket *sockdata =
(NodeImageMultiFileSocket *)input->getbNodeSocket()->storage;
@@ -88,7 +88,7 @@ void OutputFileNode::convertToOperations(NodeConverter &converter,
else { /* single layer format */
int num_inputs = getNumberOfInputSockets();
bool previewAdded = false;
for (int i = 0; i < num_inputs; ++i) {
for (int i = 0; i < num_inputs; i++) {
NodeInput *input = getInputSocket(i);
if (input->isLinked()) {
NodeImageMultiFileSocket *sockdata =
source/blender/compositor/operations/COM_BlurBaseOperation.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ __m128 *BlurBaseOperation::convert_gausstab_sse(const float *gausstab, int size)
{
int n = 2 * size + 1;
__m128 *gausstab_sse = (__m128 *)MEM_mallocN_aligned(sizeof(__m128) * n, 16, "gausstab sse");
for (int i = 0; i < n; ++i) {
for (int i = 0; i < n; i++) {
gausstab_sse[i] = _mm_set1_ps(gausstab[i]);
}
return gausstab_sse;
source/blender/compositor/operations/COM_DenoiseOperation.cpp
+1 -1
View File
@@ -152,7 +152,7 @@ void DenoiseOperation::generateDenoise(float *data,
/* copy the alpha channel, OpenImageDenoise currently only supports RGB */
size_t numPixels = inputTileColor->getWidth() * inputTileColor->getHeight();
for (size_t i = 0; i < numPixels; ++i) {
for (size_t i = 0; i < numPixels; i++) {
data[i * 4 + 3] = inputBufferColor[i * 4 + 3];
}
return;
source/blender/compositor/operations/COM_DilateErodeOperation.cpp
+2 -2
View File
@@ -387,7 +387,7 @@ void *DilateStepOperation::initializeTileData(rcti *rect)
for (x = 0; x < bwidth + 5 * half_window; x++) {
buf[x] = -FLT_MAX;
}
for (x = xmin; x < xmax; ++x) {
for (x = xmin; x < xmax; x++) {
buf[x - rect->xmin + window - 1] = buffer[(y * width + x)];
}
@@ -516,7 +516,7 @@ void *ErodeStepOperation::initializeTileData(rcti *rect)
for (x = 0; x < bwidth + 5 * half_window; x++) {
buf[x] = FLT_MAX;
}
for (x = xmin; x < xmax; ++x) {
for (x = xmin; x < xmax; x++) {
buf[x - rect->xmin + window - 1] = buffer[(y * width + x)];
}
source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ void DirectionalBlurOperation::executePixel(float output[4], int x, int y, void
float lsc = this->m_sc;
float lrot = this->m_rot;
/* blur the image */
for (int i = 0; i < iterations; ++i) {
for (int i = 0; i < iterations; i++) {
const float cs = cosf(lrot), ss = sinf(lrot);
const float isc = 1.0f / (1.0f + lsc);
source/blender/compositor/operations/COM_DisplaceOperation.cpp
+4 -4
View File
@@ -111,12 +111,12 @@ void DisplaceOperation::pixelTransform(const float xy[2], float r_uv[2], float r
if (read_displacement(xy[0] + epsilon[0], xy[1], xs, ys, xy, uv[0], uv[1])) {
r_deriv[0][0] += uv[0] - r_uv[0];
r_deriv[1][0] += uv[1] - r_uv[1];
++num;
num++;
}
if (read_displacement(xy[0] - epsilon[0], xy[1], xs, ys, xy, uv[0], uv[1])) {
r_deriv[0][0] += r_uv[0] - uv[0];
r_deriv[1][0] += r_uv[1] - uv[1];
++num;
num++;
}
if (num > 0) {
float numinv = 1.0f / (float)num;
@@ -128,12 +128,12 @@ void DisplaceOperation::pixelTransform(const float xy[2], float r_uv[2], float r
if (read_displacement(xy[0], xy[1] + epsilon[1], xs, ys, xy, uv[0], uv[1])) {
r_deriv[0][1] += uv[0] - r_uv[0];
r_deriv[1][1] += uv[1] - r_uv[1];
++num;
num++;
}
if (read_displacement(xy[0], xy[1] - epsilon[1], xs, ys, xy, uv[0], uv[1])) {
r_deriv[0][1] += r_uv[0] - uv[0];
r_deriv[1][1] += r_uv[1] - uv[1];
++num;
num++;
}
if (num > 0) {
float numinv = 1.0f / (float)num;
source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
+9 -9
View File
@@ -89,18 +89,18 @@ void *FastGaussianBlurOperation::initializeTileData(rcti *rect)
this->m_sy = this->m_data.sizey * this->m_size / 2.0f;
if ((this->m_sx == this->m_sy) && (this->m_sx > 0.0f)) {
for (c = 0; c < COM_NUM_CHANNELS_COLOR; ++c) {
for (c = 0; c < COM_NUM_CHANNELS_COLOR; c++) {
IIR_gauss(copy, this->m_sx, c, 3);
}
}
else {
if (this->m_sx > 0.0f) {
for (c = 0; c < COM_NUM_CHANNELS_COLOR; ++c) {
for (c = 0; c < COM_NUM_CHANNELS_COLOR; c++) {
IIR_gauss(copy, this->m_sx, c, 1);
}
}
if (this->m_sy > 0.0f) {
for (c = 0; c < COM_NUM_CHANNELS_COLOR; ++c) {
for (c = 0; c < COM_NUM_CHANNELS_COLOR; c++) {
IIR_gauss(copy, this->m_sy, c, 2);
}
}
@@ -216,16 +216,16 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src,
W = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss W buf");
if (xy & 1) { // H
int offset;
for (y = 0; y < src_height; ++y) {
for (y = 0; y < src_height; y++) {
const int yx = y * src_width;
offset = yx * num_channels + chan;
for (x = 0; x < src_width; ++x) {
for (x = 0; x < src_width; x++) {
X[x] = buffer[offset];
offset += num_channels;
}
YVV(src_width);
offset = yx * num_channels + chan;
for (x = 0; x < src_width; ++x) {
for (x = 0; x < src_width; x++) {
buffer[offset] = Y[x];
offset += num_channels;
}
@@ -235,15 +235,15 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src,
int offset;
const int add = src_width * num_channels;
for (x = 0; x < src_width; ++x) {
for (x = 0; x < src_width; x++) {
offset = x * num_channels + chan;
for (y = 0; y < src_height; ++y) {
for (y = 0; y < src_height; y++) {
X[y] = buffer[offset];
offset += add;
}
YVV(src_height);
offset = x * num_channels + chan;
for (y = 0; y < src_height; ++y) {
for (y = 0; y < src_height; y++) {
buffer[offset] = Y[y];
offset += add;
}
source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
+8 -8
View File
@@ -61,7 +61,7 @@ static void FHT(fREAL *data, unsigned int M, unsigned int inverse)
int i, j = 0;
unsigned int Nh = len >> 1;
for (i = 1; i < (len - 1); ++i) {
for (i = 1; i < (len - 1); i++) {
j = revbin_upd(j, Nh);
if (j > i) {
t1 = data[i];
@@ -117,7 +117,7 @@ static void FHT(fREAL *data, unsigned int M, unsigned int inverse)
if (inverse) {
fREAL sc = (fREAL)1 / (fREAL)len;
for (k = 0; k < len; ++k) {
for (k = 0; k < len; k++) {
data[k] *= sc;
}
}
@@ -136,14 +136,14 @@ static void FHT2D(
// rows (forward transform skips 0 pad data)
maxy = inverse ? Ny : nzp;
for (j = 0; j < maxy; ++j) {
for (j = 0; j < maxy; j++) {
FHT(&data[Nx * j], Mx, inverse);
}
// transpose data
if (Nx == Ny) { // square
for (j = 0; j < Ny; ++j) {
for (i = j + 1; i < Nx; ++i) {
for (j = 0; j < Ny; j++) {
for (i = j + 1; i < Nx; i++) {
unsigned int op = i + (j << Mx), np = j + (i << My);
SWAP(fREAL, data[op], data[np]);
}
@@ -171,7 +171,7 @@ static void FHT2D(
SWAP(unsigned int, Mx, My);
// now columns == transposed rows
for (j = 0; j < Ny; ++j) {
for (j = 0; j < Ny; j++) {
FHT(&data[Nx * j], Mx, inverse);
}
@@ -421,9 +421,9 @@ void GlareFogGlowOperation::generateGlare(float *data,
scale = 0.25f * sqrtf((float)(sz * sz));
for (y = 0; y < sz; ++y) {
for (y = 0; y < sz; y++) {
v = 2.0f * (y / (float)sz) - 1.0f;
for (x = 0; x < sz; ++x) {
for (x = 0; x < sz; x++) {
u = 2.0f * (x / (float)sz) - 1.0f;
r = (u * u + v * v) * scale;
d = -sqrtf(sqrtf(sqrtf(r))) * 9.0f;
source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
+3 -3
View File
@@ -41,7 +41,7 @@ void GlareStreaksOperation::generateGlare(float *data,
for (a = 0.0f; a < DEG2RADF(360.0f) && (!breaked); a += ang) {
const float an = a + settings->angle_ofs;
const float vx = cos((double)an), vy = sin((double)an);
for (n = 0; n < settings->iter && (!breaked); ++n) {
for (n = 0; n < settings->iter && (!breaked); n++) {
const float p4 = pow(4.0, (double)n);
const float vxp = vx * p4, vyp = vy * p4;
const float wt = pow((double)settings->fade, (double)p4);
@@ -50,8 +50,8 @@ void GlareStreaksOperation::generateGlare(float *data,
(double)n +
1); // colormodulation amount relative to current pass
float *tdstcol = tdst->getBuffer();
for (y = 0; y < tsrc->getHeight() && (!breaked); ++y) {
for (x = 0; x < tsrc->getWidth(); ++x, tdstcol += 4) {
for (y = 0; y < tsrc->getHeight() && (!breaked); y++) {
for (x = 0; x < tsrc->getWidth(); x++, tdstcol += 4) {
// first pass no offset, always same for every pass, exact copy,
// otherwise results in uneven brightness, only need once
if (n == 0) {
source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ void KeyingBlurOperation::executePixel(float output[4], int x, int y, void *data
if (this->m_axis == 0) {
const int start = max(0, x - this->m_size + 1), end = min(bufferWidth, x + this->m_size);
for (int cx = start; cx < end; ++cx) {
for (int cx = start; cx < end; cx++) {
int bufferIndex = (y * bufferWidth + cx);
average += buffer[bufferIndex];
count++;
@@ -60,7 +60,7 @@ void KeyingBlurOperation::executePixel(float output[4], int x, int y, void *data
else {
const int start = max(0, y - this->m_size + 1),
end = min(inputBuffer->getHeight(), y + this->m_size);
for (int cy = start; cy < end; ++cy) {
for (int cy = start; cy < end; cy++) {
int bufferIndex = (cy * bufferWidth + x);
average += buffer[bufferIndex];
count++;
source/blender/compositor/operations/COM_KeyingClipOperation.cpp
+2 -2
View File
@@ -71,8 +71,8 @@ void KeyingClipOperation::executePixel(float output[4], int x, int y, void *data
ok = true;
}
for (int cx = start_x; ok == false && cx <= end_x; ++cx) {
for (int cy = start_y; ok == false && cy <= end_y; ++cy) {
for (int cx = start_x; ok == false && cx <= end_x; cx++) {
for (int cy = start_y; ok == false && cy <= end_y; cy++) {
if (UNLIKELY(cx == x && cy == y)) {
continue;
}
source/blender/compositor/operations/COM_MapUVOperation.cpp
+4 -4
View File
@@ -117,12 +117,12 @@ void MapUVOperation::pixelTransform(const float xy[2],
if (read_uv(xy[0] + epsilon[0], xy[1], uv[0], uv[1], alpha)) {
r_deriv[0][0] += uv[0] - r_uv[0];
r_deriv[1][0] += uv[1] - r_uv[1];
++num;
num++;
}
if (read_uv(xy[0] - epsilon[0], xy[1], uv[0], uv[1], alpha)) {
r_deriv[0][0] += r_uv[0] - uv[0];
r_deriv[1][0] += r_uv[1] - uv[1];
++num;
num++;
}
if (num > 0) {
float numinv = 1.0f / (float)num;
@@ -134,12 +134,12 @@ void MapUVOperation::pixelTransform(const float xy[2],
if (read_uv(xy[0], xy[1] + epsilon[1], uv[0], uv[1], alpha)) {
r_deriv[0][1] += uv[0] - r_uv[0];
r_deriv[1][1] += uv[1] - r_uv[1];
++num;
num++;
}
if (read_uv(xy[0], xy[1] - epsilon[1], uv[0], uv[1], alpha)) {
r_deriv[0][1] += r_uv[0] - uv[0];
r_deriv[1][1] += r_uv[1] - uv[1];
++num;
num++;
}
if (num > 0) {
float numinv = 1.0f / (float)num;
source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
+4 -4
View File
@@ -183,7 +183,7 @@ void *OutputOpenExrMultiLayerMultiViewOperation::get_handle(const char *filename
IMB_exr_add_view(exrhandle, srv->name);
for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
for (unsigned int i = 0; i < this->m_layers.size(); i++) {
add_exr_channels(exrhandle,
this->m_layers[i].name,
this->m_layers[i].datatype,
@@ -229,7 +229,7 @@ void OutputOpenExrMultiLayerMultiViewOperation::deinitExecution()
exrhandle = this->get_handle(filename);
for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
for (unsigned int i = 0; i < this->m_layers.size(); i++) {
add_exr_channels(exrhandle,
this->m_layers[i].name,
this->m_layers[i].datatype,
@@ -239,7 +239,7 @@ void OutputOpenExrMultiLayerMultiViewOperation::deinitExecution()
this->m_layers[i].outputBuffer);
}
for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
for (unsigned int i = 0; i < this->m_layers.size(); i++) {
/* memory can only be freed after we write all views to the file */
this->m_layers[i].outputBuffer = NULL;
this->m_layers[i].imageInput = NULL;
@@ -250,7 +250,7 @@ void OutputOpenExrMultiLayerMultiViewOperation::deinitExecution()
IMB_exr_write_channels(exrhandle);
/* free buffer memory for all the views */
for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
for (unsigned int i = 0; i < this->m_layers.size(); i++) {
free_exr_channels(
exrhandle, this->m_rd, this->m_layers[i].name, this->m_layers[i].datatype);
}
source/blender/compositor/operations/COM_OutputFileOperation.cpp
+5 -5
View File
@@ -162,7 +162,7 @@ static void write_buffer_rect(rcti *rect,
for (x = x1; x < x2 && (!breaked); x++) {
reader->readSampled(color, x, y, COM_PS_NEAREST);
for (i = 0; i < size; ++i) {
for (i = 0; i < size; i++) {
buffer[offset + i] = color[i];
}
offset += size;
@@ -298,7 +298,7 @@ void OutputOpenExrMultiLayerOperation::add_layer(const char *name,
void OutputOpenExrMultiLayerOperation::initExecution()
{
for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
for (unsigned int i = 0; i < this->m_layers.size(); i++) {
if (this->m_layers[i].use_layer) {
SocketReader *reader = getInputSocketReader(i);
this->m_layers[i].imageInput = reader;
@@ -310,7 +310,7 @@ void OutputOpenExrMultiLayerOperation::initExecution()
void OutputOpenExrMultiLayerOperation::executeRegion(rcti *rect, unsigned int /*tileNumber*/)
{
for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
for (unsigned int i = 0; i < this->m_layers.size(); i++) {
OutputOpenExrLayer &layer = this->m_layers[i];
if (layer.imageInput) {
write_buffer_rect(rect,
@@ -343,7 +343,7 @@ void OutputOpenExrMultiLayerOperation::deinitExecution()
suffix);
BLI_make_existing_file(filename);
for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
for (unsigned int i = 0; i < this->m_layers.size(); i++) {
OutputOpenExrLayer &layer = this->m_layers[i];
if (!layer.imageInput) {
continue; /* skip unconnected sockets */
@@ -369,7 +369,7 @@ void OutputOpenExrMultiLayerOperation::deinitExecution()
}
IMB_exr_close(exrhandle);
for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
for (unsigned int i = 0; i < this->m_layers.size(); i++) {
if (this->m_layers[i].outputBuffer) {
MEM_freeN(this->m_layers[i].outputBuffer);
this->m_layers[i].outputBuffer = NULL;
source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp
+2 -2
View File
@@ -60,7 +60,7 @@ static bool check_corners(float corners[4][2])
static void readCornersFromSockets(rcti *rect, SocketReader *readers[4], float corners[4][2])
{
for (int i = 0; i < 4; ++i) {
for (int i = 0; i < 4; i++) {
float result[4] = {0.0f, 0.0f, 0.0f, 0.0f};
readers[i]->readSampled(result, rect->xmin, rect->ymin, COM_PS_NEAREST);
corners[i][0] = result[0];
@@ -208,7 +208,7 @@ void *PlaneCornerPinWarpImageOperation::initializeTileData(rcti *rect)
bool PlaneCornerPinWarpImageOperation::determineDependingAreaOfInterest(
rcti *input, ReadBufferOperation *readOperation, rcti *output)
{
for (int i = 0; i < 4; ++i) {
for (int i = 0; i < 4; i++) {
if (getInputOperation(i + 1)->determineDependingAreaOfInterest(input, readOperation, output)) {
return true;
}
source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
+4 -4
View File
@@ -105,7 +105,7 @@ void PlaneDistortWarpImageOperation::executePixelSampled(float output[4],
}
else {
zero_v4(output);
for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) {
for (int sample = 0; sample < this->m_motion_blur_samples; sample++) {
float color[4];
warpCoord(x, y, this->m_samples[sample].perspectiveMatrix, uv, deriv);
m_pixelReader->readFiltered(color, uv[0], uv[1], deriv[0], deriv[1]);
@@ -121,7 +121,7 @@ bool PlaneDistortWarpImageOperation::determineDependingAreaOfInterest(
float min[2], max[2];
INIT_MINMAX2(min, max);
for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) {
for (int sample = 0; sample < this->m_motion_blur_samples; sample++) {
float UVs[4][2];
float deriv[2][2];
MotionSample *sample_data = &this->m_samples[sample];
@@ -208,9 +208,9 @@ void PlaneDistortMaskOperation::executePixelSampled(float output[4],
output[0] = (float)inside_counter / this->m_osa;
}
else {
for (int motion_sample = 0; motion_sample < this->m_motion_blur_samples; ++motion_sample) {
for (int motion_sample = 0; motion_sample < this->m_motion_blur_samples; motion_sample++) {
MotionSample *sample_data = &this->m_samples[motion_sample];
for (int osa_sample = 0; osa_sample < this->m_osa; ++osa_sample) {
for (int osa_sample = 0; osa_sample < this->m_osa; osa_sample++) {
point[0] = x + this->m_jitter[osa_sample][0];
point[1] = y + this->m_jitter[osa_sample][1];
if (isect_point_tri_v2(point,
source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
+2 -2
View File
@@ -93,7 +93,7 @@ void PlaneTrackMaskOperation::initExecution()
const float frame = (float)this->m_framenumber - this->m_motion_blur_shutter;
const float frame_step = (this->m_motion_blur_shutter * 2.0f) / this->m_motion_blur_samples;
float frame_iter = frame;
for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) {
for (int sample = 0; sample < this->m_motion_blur_samples; sample++) {
readCornersFromTrack(corners, frame_iter);
calculateCorners(corners, true, sample);
frame_iter += frame_step;
@@ -116,7 +116,7 @@ void PlaneTrackWarpImageOperation::initExecution()
const float frame = (float)this->m_framenumber - this->m_motion_blur_shutter;
const float frame_step = (this->m_motion_blur_shutter * 2.0f) / this->m_motion_blur_samples;
float frame_iter = frame;
for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) {
for (int sample = 0; sample < this->m_motion_blur_samples; sample++) {
readCornersFromTrack(corners, frame_iter);
calculateCorners(corners, true, sample);
frame_iter += frame_step;
source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ void ScreenLensDistortionOperation::accumulate(MemoryBuffer *buffer,
float k4 = m_k4[a];
float dk4 = m_dk4[a];
for (float z = 0; z < ds; ++z) {
for (float z = 0; z < ds; z++) {
float tz = (z + (m_jitter ? BLI_rng_get_float(m_rng) : 0.5f)) * sd;
float t = 1.0f - (k4 + tz * dk4) * r_sq;
source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
+1 -1
View File
@@ -176,7 +176,7 @@ void solve_cycles(CyclesSolverState *state)
OperationNode *node = entry->node;
bool all_child_traversed = true;
const int num_visited = get_node_num_visited_children(node);
for (int i = num_visited; i < node->outlinks.size(); ++i) {
for (int i = num_visited; i < node->outlinks.size(); i++) {
Relation *rel = node->outlinks[i];
if (rel->to->type == NodeType::OPERATION) {
OperationNode *to = (OperationNode *)rel->to;
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+2 -2
View File
@@ -1155,7 +1155,7 @@ void DepsgraphNodeBuilder::build_particle_settings(ParticleSettings *particle_se
&particle_settings->id, NodeType::PARTICLE_SETTINGS, OperationCode::PARTICLE_SETTINGS_EVAL);
op_node->set_as_exit();
/* Texture slots. */
for (int mtex_index = 0; mtex_index < MAX_MTEX; ++mtex_index) {
for (int mtex_index = 0; mtex_index < MAX_MTEX; mtex_index++) {
MTex *mtex = particle_settings->mtex[mtex_index];
if (mtex == NULL || mtex->tex == NULL) {
continue;
@@ -1436,7 +1436,7 @@ void DepsgraphNodeBuilder::build_material(Material *material)
void DepsgraphNodeBuilder::build_materials(Material **materials, int num_materials)
{
for (int i = 0; i < num_materials; ++i) {
for (int i = 0; i < num_materials; i++) {
if (materials[i] == NULL) {
continue;
}
source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+1 -1
View File
@@ -105,7 +105,7 @@ void DepsgraphNodeBuilder::build_view_layer(Scene *scene,
*
* TODO(sergey): Need to go more granular on visibility checks. */
build_object(base_index, base->object, linked_state, true);
++base_index;
base_index++;
}
}
build_layer_collections(&view_layer->layer_collections);
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+2 -2
View File
@@ -1809,7 +1809,7 @@ void DepsgraphRelationBuilder::build_particle_settings(ParticleSettings *part)
particle_settings_init_key, particle_settings_eval_key, "Particle Settings Init Order");
add_relation(particle_settings_reset_key, particle_settings_eval_key, "Particle Settings Reset");
/* Texture slots. */
for (int mtex_index = 0; mtex_index < MAX_MTEX; ++mtex_index) {
for (int mtex_index = 0; mtex_index < MAX_MTEX; mtex_index++) {
MTex *mtex = part->mtex[mtex_index];
if (mtex == NULL || mtex->tex == NULL) {
continue;
@@ -2258,7 +2258,7 @@ void DepsgraphRelationBuilder::build_material(Material *material)
void DepsgraphRelationBuilder::build_materials(Material **materials, int num_materials)
{
for (int i = 0; i < num_materials; ++i) {
for (int i = 0; i < num_materials; i++) {
if (materials[i] == NULL) {
continue;
}
source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
+3 -3
View File
@@ -92,15 +92,15 @@ void deg_graph_transitive_reduction(Depsgraph *graph)
* set/cleared. */
/* TODO: there will be other types in future, so iterators above
* need modifying. */
++it_rel;
it_rel++;
}
else if (rel->from->custom_flags & OP_REACHABLE) {
rel->unlink();
OBJECT_GUARDED_DELETE(rel, Relation);
++num_removed_relations;
num_removed_relations++;
}
else {
++it_rel;
it_rel++;
}
}
}
source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
+2 -2
View File
@@ -144,7 +144,7 @@ static int deg_debug_node_color_index(const Node *node)
#ifdef COLOR_SCHEME_NODE_TYPE
const int(*pair)[2];
for (pair = deg_debug_node_type_color_map; (*pair)[0] >= 0; ++pair) {
for (pair = deg_debug_node_type_color_map; (*pair)[0] >= 0; pair++) {
if ((*pair)[0] == node->type) {
return (*pair)[1];
}
@@ -197,7 +197,7 @@ static void deg_debug_graphviz_legend(const DebugContext &ctx)
#ifdef COLOR_SCHEME_NODE_TYPE
const int(*pair)[2];
for (pair = deg_debug_node_type_color_map; (*pair)[0] >= 0; ++pair) {
for (pair = deg_debug_node_type_color_map; (*pair)[0] >= 0; pair++) {
DepsNodeFactory *nti = type_get_factory((NodeType)(*pair)[0]);
deg_debug_graphviz_legend_color(
ctx, nti->tname().c_str(), deg_debug_colors_light[(*pair)[1] % deg_debug_max_colors]);
source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
+1 -1
View File
@@ -85,7 +85,7 @@ string gnuplotify_name(const string &name)
{
string result = "";
const int length = name.length();
for (int i = 0; i < length; ++i) {
for (int i = 0; i < length; i++) {
const char ch = name[i];
if (ch == '_') {
result += "\\\\\\";
source/blender/depsgraph/intern/depsgraph_debug.cc
+5 -5
View File
@@ -112,13 +112,13 @@ bool DEG_debug_consistency_check(Depsgraph *graph)
int counter1 = 0;
for (DEG::Relation *tmp_rel : node->outlinks) {
if (tmp_rel == rel) {
++counter1;
counter1++;
}
}
int counter2 = 0;
for (DEG::Relation *tmp_rel : rel->to->inlinks) {
if (tmp_rel == rel) {
++counter2;
counter2++;
}
}
if (counter1 != counter2) {
@@ -137,13 +137,13 @@ bool DEG_debug_consistency_check(Depsgraph *graph)
int counter1 = 0;
for (DEG::Relation *tmp_rel : node->inlinks) {
if (tmp_rel == rel) {
++counter1;
counter1++;
}
}
int counter2 = 0;
for (DEG::Relation *tmp_rel : rel->from->outlinks) {
if (tmp_rel == rel) {
++counter2;
counter2++;
}
}
if (counter1 != counter2) {
@@ -179,7 +179,7 @@ bool DEG_debug_consistency_check(Depsgraph *graph)
int num_links_pending = 0;
for (DEG::Relation *rel : node->inlinks) {
if (rel->from->type == DEG::NodeType::OPERATION) {
++num_links_pending;
num_links_pending++;
}
}
if (node->num_links_pending != num_links_pending) {
source/blender/draw/engines/eevee/eevee_bloom.c
+6 -6
View File
@@ -128,7 +128,7 @@ int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
/* Downsample buffers */
copy_v2_v2_int(texsize, blitsize);
for (int i = 0; i < effects->bloom_iteration_len; ++i) {
for (int i = 0; i < effects->bloom_iteration_len; i++) {
texsize[0] /= 2;
texsize[1] /= 2;
@@ -147,7 +147,7 @@ int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
/* Upsample buffers */
copy_v2_v2_int(texsize, blitsize);
for (int i = 0; i < effects->bloom_iteration_len - 1; ++i) {
for (int i = 0; i < effects->bloom_iteration_len - 1; i++) {
texsize[0] /= 2;
texsize[1] /= 2;
@@ -167,7 +167,7 @@ int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
/* Cleanup to release memory */
GPU_FRAMEBUFFER_FREE_SAFE(fbl->bloom_blit_fb);
for (int i = 0; i < MAX_BLOOM_STEP - 1; ++i) {
for (int i = 0; i < MAX_BLOOM_STEP - 1; i++) {
GPU_FRAMEBUFFER_FREE_SAFE(fbl->bloom_down_fb[i]);
GPU_FRAMEBUFFER_FREE_SAFE(fbl->bloom_accum_fb[i]);
}
@@ -288,7 +288,7 @@ void EEVEE_bloom_draw(EEVEE_Data *vedata)
last = effects->bloom_downsample[0];
for (int i = 1; i < effects->bloom_iteration_len; ++i) {
for (int i = 1; i < effects->bloom_iteration_len; i++) {
copy_v2_v2(effects->unf_source_texel_size, effects->downsamp_texel_size[i - 1]);
effects->unf_source_buffer = last;
@@ -300,7 +300,7 @@ void EEVEE_bloom_draw(EEVEE_Data *vedata)
}
/* Upsample and accumulate */
for (int i = effects->bloom_iteration_len - 2; i >= 0; --i) {
for (int i = effects->bloom_iteration_len - 2; i >= 0; i--) {
copy_v2_v2(effects->unf_source_texel_size, effects->downsamp_texel_size[i]);
effects->unf_source_buffer = effects->bloom_downsample[i];
effects->unf_base_buffer = last;
@@ -324,7 +324,7 @@ void EEVEE_bloom_draw(EEVEE_Data *vedata)
void EEVEE_bloom_free(void)
{
for (int i = 0; i < 2; ++i) {
for (int i = 0; i < 2; i++) {
DRW_SHADER_FREE_SAFE(e_data.bloom_blit_sh[i]);
DRW_SHADER_FREE_SAFE(e_data.bloom_downsample_sh[i]);
DRW_SHADER_FREE_SAFE(e_data.bloom_upsample_sh[i]);
source/blender/draw/engines/eevee/eevee_depth_of_field.c
+1 -1
View File
@@ -269,7 +269,7 @@ void EEVEE_depth_of_field_draw(EEVEE_Data *vedata)
void EEVEE_depth_of_field_free(void)
{
for (int i = 0; i < 2; ++i) {
for (int i = 0; i < 2; i++) {
DRW_SHADER_FREE_SAFE(e_data.dof_downsample_sh[i]);
DRW_SHADER_FREE_SAFE(e_data.dof_scatter_sh[i]);
DRW_SHADER_FREE_SAFE(e_data.dof_resolve_sh[i]);
source/blender/draw/engines/eevee/eevee_effects.c
+1 -1
View File
@@ -206,7 +206,7 @@ void EEVEE_effects_init(EEVEE_ViewLayerData *sldata,
/**
* Compute Mipmap texel alignment.
*/
for (int i = 0; i < 10; ++i) {
for (int i = 0; i < 10; i++) {
int mip_size[2];
GPU_texture_get_mipmap_size(txl->color, i, mip_size);
common_data->mip_ratio[i][0] = viewport_size[0] / (mip_size[0] * powf(2.0f, i));
source/blender/draw/engines/eevee/eevee_lightcache.c
+13 -13
View File
@@ -188,7 +188,7 @@ static uint eevee_lightcache_memsize_get(LightCache *lcache)
}
if (lcache->cube_tx.data) {
size += MEM_allocN_len(lcache->cube_tx.data);
for (int mip = 0; mip < lcache->mips_len; ++mip) {
for (int mip = 0; mip < lcache->mips_len; mip++) {
size += MEM_allocN_len(lcache->cube_mips[mip].data);
}
}
@@ -199,7 +199,7 @@ static int eevee_lightcache_irradiance_sample_count(LightCache *lcache)
{
int total_irr_samples = 0;
for (int i = 1; i < lcache->grid_len; ++i) {
for (int i = 1; i < lcache->grid_len; i++) {
EEVEE_LightGrid *egrid = lcache->grid_data + i;
total_irr_samples += egrid->resolution[0] * egrid->resolution[1] * egrid->resolution[2];
}
@@ -305,7 +305,7 @@ LightCache *EEVEE_lightcache_create(const int grid_len,
light_cache->cube_mips = MEM_callocN(sizeof(LightCacheTexture) * light_cache->mips_len,
"LightCacheTexture");
for (int mip = 0; mip < light_cache->mips_len; ++mip) {
for (int mip = 0; mip < light_cache->mips_len; mip++) {
GPU_texture_get_mipmap_size(
light_cache->cube_tx.tex, mip + 1, light_cache->cube_mips[mip].tex_size);
}
@@ -346,7 +346,7 @@ void EEVEE_lightcache_load(LightCache *lcache)
NULL);
GPU_texture_bind(lcache->cube_tx.tex, 0);
GPU_texture_mipmap_mode(lcache->cube_tx.tex, true, true);
for (int mip = 0; mip < lcache->mips_len; ++mip) {
for (int mip = 0; mip < lcache->mips_len; mip++) {
GPU_texture_add_mipmap(
lcache->cube_tx.tex, GPU_DATA_10_11_11_REV, mip + 1, lcache->cube_mips[mip].data);
}
@@ -369,7 +369,7 @@ static void eevee_lightbake_readback_reflections(LightCache *lcache)
lcache->cube_tx.data_type = LIGHTCACHETEX_UINT;
lcache->cube_tx.components = 1;
for (int mip = 0; mip < lcache->mips_len; ++mip) {
for (int mip = 0; mip < lcache->mips_len; mip++) {
LightCacheTexture *cube_mip = lcache->cube_mips + mip;
MEM_SAFE_FREE(cube_mip->data);
GPU_texture_get_mipmap_size(lcache->cube_tx.tex, mip + 1, cube_mip->tex_size);
@@ -388,7 +388,7 @@ void EEVEE_lightcache_free(LightCache *lcache)
MEM_SAFE_FREE(lcache->grid_tx.data);
if (lcache->cube_mips) {
for (int i = 0; i < lcache->mips_len; ++i) {
for (int i = 0; i < lcache->mips_len; i++) {
MEM_SAFE_FREE(lcache->cube_mips[i].data);
}
MEM_SAFE_FREE(lcache->cube_mips);
@@ -471,7 +471,7 @@ static void eevee_lightbake_create_render_target(EEVEE_LightBake *lbake, int rt_
lbake->rt_color = DRW_texture_create_cube(
rt_res, GPU_RGBA16F, DRW_TEX_FILTER | DRW_TEX_MIPMAP, NULL);
for (int i = 0; i < 6; ++i) {
for (int i = 0; i < 6; i++) {
GPU_framebuffer_ensure_config(&lbake->rt_fb[i],
{GPU_ATTACHMENT_TEXTURE_CUBEFACE(lbake->rt_depth, i),
GPU_ATTACHMENT_TEXTURE_CUBEFACE(lbake->rt_color, i)});
@@ -670,7 +670,7 @@ static void eevee_lightbake_delete_resources(EEVEE_LightBake *lbake)
DRW_TEXTURE_FREE_SAFE(lbake->rt_color);
DRW_TEXTURE_FREE_SAFE(lbake->grid_prev);
GPU_FRAMEBUFFER_FREE_SAFE(lbake->store_fb);
for (int i = 0; i < 6; ++i) {
for (int i = 0; i < 6; i++) {
GPU_FRAMEBUFFER_FREE_SAFE(lbake->rt_fb[i]);
}
@@ -875,10 +875,10 @@ static void compute_cell_id(EEVEE_LightGrid *egrid,
*r_stride = 0;
*r_final_idx = 0;
r_local_cell[0] = r_local_cell[1] = r_local_cell[2] = 0;
for (int lvl = max_lvl; lvl >= 0; --lvl) {
for (int lvl = max_lvl; lvl >= 0; lvl--) {
*r_stride = 1 << lvl;
int prev_stride = *r_stride << 1;
for (int i = 0; i < cell_count; ++i) {
for (int i = 0; i < cell_count; i++) {
*r_final_idx = i;
cell_id_to_grid_loc(egrid, *r_final_idx, r_local_cell);
if (((r_local_cell[0] % *r_stride) == 0) && ((r_local_cell[1] % *r_stride) == 0) &&
@@ -1210,12 +1210,12 @@ void EEVEE_lightbake_job(void *custom_data, short *stop, short *do_update, float
/* Render irradiance grids */
if (lcache->flag & LIGHTCACHE_UPDATE_GRID) {
for (lbake->bounce_curr = 0; lbake->bounce_curr < lbake->bounce_len; ++lbake->bounce_curr) {
for (lbake->bounce_curr = 0; lbake->bounce_curr < lbake->bounce_len; lbake->bounce_curr++) {
/* Bypass world, start at 1. */
lbake->probe = lbake->grid_prb + 1;
lbake->grid = lcache->grid_data + 1;
for (lbake->grid_curr = 1; lbake->grid_curr < lbake->grid_len;
++lbake->grid_curr, ++lbake->probe, ++lbake->grid) {
lbake->grid_curr++, lbake->probe++, lbake->grid++) {
LightProbe *prb = *lbake->probe;
lbake->grid_sample_len = prb->grid_resolution_x * prb->grid_resolution_y *
prb->grid_resolution_z;
@@ -1233,7 +1233,7 @@ void EEVEE_lightbake_job(void *custom_data, short *stop, short *do_update, float
lbake->probe = lbake->cube_prb + 1;
lbake->cube = lcache->cube_data + 1;
for (lbake->cube_offset = 1; lbake->cube_offset < lbake->cube_len;
++lbake->cube_offset, ++lbake->probe, ++lbake->cube) {
lbake->cube_offset++, lbake->probe++, lbake->cube++) {
lightbake_do_sample(lbake, eevee_lightbake_render_probe_sample);
}
}
source/blender/draw/engines/eevee/eevee_lightprobes.c
+6 -6
View File
@@ -410,7 +410,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
/* Grid Display */
if (scene_eval->eevee.flag & SCE_EEVEE_SHOW_IRRADIANCE) {
EEVEE_LightGrid *egrid = lcache->grid_data + 1;
for (int p = 1; p < lcache->grid_len; ++p, egrid++) {
for (int p = 1; p < lcache->grid_len; p++, egrid++) {
DRWShadingGroup *shgrp = DRW_shgroup_create(EEVEE_shaders_probe_grid_display_sh_get(),
psl->probe_display);
@@ -471,7 +471,7 @@ static bool eevee_lightprobes_culling_test(Object *ob)
normalize_v3(tmp[2]);
mul_v3_fl(tmp[2], probe->distinf);
for (int v = 0; v < 8; ++v) {
for (int v = 0; v < 8; v++) {
mul_m4_v3(tmp, bbox.vec[v]);
}
const DRWView *default_view = DRW_view_default_get();
@@ -845,7 +845,7 @@ static void render_cubemap(void (*callback)(int face, EEVEE_BakeRenderData *user
}
}
for (int i = 0; i < 6; ++i) {
for (int i = 0; i < 6; i++) {
DRW_view_set_active(views[i]);
callback(i, user_data);
}
@@ -860,11 +860,11 @@ static void render_reflections(void (*callback)(int face, EEVEE_BakeRenderData *
DRWView *main_view = stl->effects->taa_view;
DRWView **views = stl->g_data->planar_views;
/* Prepare views at the same time for faster culling. */
for (int i = 0; i < ref_count; ++i) {
for (int i = 0; i < ref_count; i++) {
lightbake_planar_ensure_view(&planar_data[i], main_view, &views[i]);
}
for (int i = 0; i < ref_count; ++i) {
for (int i = 0; i < ref_count; i++) {
DRW_view_set_active(views[i]);
callback(i, user_data);
}
@@ -1217,7 +1217,7 @@ static void downsample_planar(void *vedata, int level)
const float *size = DRW_viewport_size_get();
copy_v2_v2(stl->g_data->planar_texel_size, size);
for (int i = 0; i < level - 1; ++i) {
for (int i = 0; i < level - 1; i++) {
stl->g_data->planar_texel_size[0] /= 2.0f;
stl->g_data->planar_texel_size[1] /= 2.0f;
min_ff(floorf(stl->g_data->planar_texel_size[0]), 1.0f);
source/blender/draw/engines/eevee/eevee_materials.c
+6 -6
View File
@@ -447,7 +447,7 @@ static void eevee_init_util_texture(void)
texels_layer += 64 * 64;
/* Copy Refraction GGX LUT in layer 5 - 21 */
for (int j = 0; j < 16; ++j) {
for (int j = 0; j < 16; j++) {
for (int i = 0; i < 64 * 64; i++) {
texels_layer[i][0] = btdf_split_sum_ggx[j * 2][i];
texels_layer[i][1] = 0.0; /* UNUSED */
@@ -1457,7 +1457,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata,
struct GPUMaterial **gpumat_depth_array = BLI_array_alloca(gpumat_array, materials_len);
struct Material **ma_array = BLI_array_alloca(ma_array, materials_len);
for (int i = 0; i < materials_len; ++i) {
for (int i = 0; i < materials_len; i++) {
ma_array[i] = eevee_object_material_get(ob, i);
gpumat_array[i] = NULL;
gpumat_depth_array[i] = NULL;
@@ -1525,7 +1525,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata,
/* TODO(fclem): Support shadows in sculpt mode. */
}
else if (mat_geom) {
for (int i = 0; i < materials_len; ++i) {
for (int i = 0; i < materials_len; i++) {
if (mat_geom[i] == NULL) {
continue;
}
@@ -1551,7 +1551,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata,
ADD_SHGROUP_CALL_SAFE(shgrp_depth_clip_array[i], ob, mat_geom[i], oedata);
char *name = auto_layer_names;
for (int j = 0; j < auto_layer_count; ++j) {
for (int j = 0; j < auto_layer_count; j++) {
/* TODO don't add these uniform when not needed (default pass shaders). */
/* FIXME: This is broken, as it overrides any autolayers srgb bool of the previous mesh
* that shares the same material. */
@@ -1728,7 +1728,7 @@ void EEVEE_materials_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
void EEVEE_materials_free(void)
{
for (int i = 0; i < VAR_MAT_MAX; ++i) {
for (int i = 0; i < VAR_MAT_MAX; i++) {
DRW_SHADER_FREE_SAFE(e_data.default_lit[i]);
}
MEM_SAFE_FREE(e_data.frag_shader_lib);
@@ -1747,7 +1747,7 @@ void EEVEE_materials_free(void)
void EEVEE_materials_draw_opaque(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_PassList *psl)
{
for (int i = 0; i < VAR_MAT_MAX; ++i) {
for (int i = 0; i < VAR_MAT_MAX; i++) {
if (psl->default_pass[i]) {
DRW_draw_pass(psl->default_pass[i]);
}
source/blender/draw/engines/eevee/eevee_render.c
+1 -1
View File
@@ -369,7 +369,7 @@ static void eevee_render_result_z(RenderLayer *rl,
DRW_view_winmat_get(NULL, winmat, false);
/* Convert ogl depth [0..1] to view Z [near..far] */
for (int i = 0; i < rp->rectx * rp->recty; ++i) {
for (int i = 0; i < rp->rectx * rp->recty; i++) {
if (rp->rect[i] == 1.0f) {
rp->rect[i] = 1e10f; /* Background */
}

Some files were not shown because too many files have changed in this diff Show More