griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix build error after recent cleanup

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-07-31 18:57:39 +02:00
parent 6bda1fbd2e
commit 81d4cf5f5a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/alembic/intern/alembic_capi.cc
View File

@@ -566,11 +566,10 @@ static std::pair<bool, AbcObjectReader *> visit_object(
/* We can now assign this reader as parent for our children. */
if (nonclaiming_child_readers.size() + assign_as_parent.size() > 0) {
/* TODO: When we only support C++11, use for (a: b) instead. */
BOOST_FOREACH (AbcObjectReader *child_reader, nonclaiming_child_readers) {
for (AbcObjectReader *child_reader : nonclaiming_child_readers) {
child_reader->parent_reader = reader;
}
BOOST_FOREACH (AbcObjectReader *child_reader, assign_as_parent) {
for (AbcObjectReader *child_reader : assign_as_parent) {
child_reader->parent_reader = reader;
}
}
@@ -581,14 +580,14 @@ static std::pair<bool, AbcObjectReader *> visit_object(
* our non-claiming children. Since all claiming children share
* the same XForm, it doesn't really matter which one we pick. */
AbcObjectReader *claiming_child = claiming_child_readers[0];
BOOST_FOREACH (AbcObjectReader *child_reader, nonclaiming_child_readers) {
for (AbcObjectReader *child_reader : nonclaiming_child_readers) {
child_reader->parent_reader = claiming_child;
}
BOOST_FOREACH (AbcObjectReader *child_reader, assign_as_parent) {
for (AbcObjectReader *child_reader : assign_as_parent) {
child_reader->parent_reader = claiming_child;
}
/* Claiming children should have our parent set as their parent. */
BOOST_FOREACH (AbcObjectReader *child_reader, claiming_child_readers) {
for (AbcObjectReader *child_reader : claiming_child_readers) {
r_assign_as_parent.push_back(child_reader);
}
}
@@ -596,13 +595,13 @@ static std::pair<bool, AbcObjectReader *> visit_object(
/* This object isn't claimed by any child, and didn't produce
* a reader. Odd situation, could be the top Alembic object, or
* an unsupported Alembic schema. Delegate to our parent. */
BOOST_FOREACH (AbcObjectReader *child_reader, claiming_child_readers) {
for (AbcObjectReader *child_reader : claiming_child_readers) {
r_assign_as_parent.push_back(child_reader);
}
BOOST_FOREACH (AbcObjectReader *child_reader, nonclaiming_child_readers) {
for (AbcObjectReader *child_reader : nonclaiming_child_readers) {
r_assign_as_parent.push_back(child_reader);
}
BOOST_FOREACH (AbcObjectReader *child_reader, assign_as_parent) {
for (AbcObjectReader *child_reader : assign_as_parent) {
r_assign_as_parent.push_back(child_reader);
}
}