[Bf-blender-cvs] [fd05f01be60] master: Partially revert "Cleanup: use post increment/decrement"
Campbell Barton
noreply at git.blender.org
Sat Sep 7 20:11:17 CEST 2019
Commit: fd05f01be60128e70b7e53d566627c9e84b6a98d
Author: Campbell Barton
Date: Sun Sep 8 03:31:49 2019 +1000
Branches: master
https://developer.blender.org/rBfd05f01be60128e70b7e53d566627c9e84b6a98d
Partially revert "Cleanup: use post increment/decrement"
This partially reverts commit 0b2d1badecc48b5cbff5ec088b29c6e9acc5e1d0
Post increment can deep-copy for C++ iterators, while in my own checks
GCC was able to optimize this to get the same output,
better follow C++ best practice and use pre-increment for iterators.
===================================================================
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/abc_nurbs.cc
M source/blender/alembic/intern/alembic_capi.cc
M source/blender/collada/AnimationExporter.cpp
M source/blender/collada/BCAnimationSampler.cpp
M source/blender/collada/BCAnimationSampler.h
M source/blender/collada/BCSampleData.cpp
M source/blender/collada/ControllerExporter.cpp
M source/blender/collada/collada_utils.cpp
M source/blender/compositor/intern/COM_NodeGraph.cpp
M source/blender/compositor/intern/COM_NodeOperation.cpp
M source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
M source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
M source/blender/ikplugin/intern/itasc_plugin.cpp
M source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 9c1909b6022..a7549cc1f47 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -197,7 +197,7 @@ 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;
}
@@ -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) {
@@ -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);
}
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 92de3547fd2..5de21075a23 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -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));
@@ -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());
diff --git a/source/blender/alembic/intern/abc_nurbs.cc b/source/blender/alembic/intern/abc_nurbs.cc
index f2d0a9f1e16..739276dffa6 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -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()) {
@@ -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;
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index ffe58f7976f..13533ef9972 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -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;
}
@@ -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();
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index c2ba397131c..9d0d075cade 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -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;
diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/collada/BCAnimationSampler.cpp
index d1f59125790..5262d0b3672 100644
--- a/source/blender/collada/BCAnimationSampler.cpp
+++ b/source/blender/collada/BCAnimationSampler.cpp
@@ -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;
}
@@ -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);
@@ -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 *> &an
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list