Commit: 997ff4bdc44eadb58f3e7fe9dd59706053b553c4
Author: Sybren A. Stüvel
Date: Thu Feb 23 16:19:14 2017 +0100
Branches: master
https://developer.blender.org/rB997ff4bdc44eadb58f3e7fe9dd59706053b553c4
Alembic import: nicer progress updates
===================================================================
M source/blender/alembic/intern/alembic_capi.cc
===================================================================
diff --git a/source/blender/alembic/intern/alembic_capi.cc
b/source/blender/alembic/intern/alembic_capi.cc
index 44f49542828..7bc92a7c516 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -647,7 +647,7 @@ static void import_startjob(void *user_data, short *stop,
short *do_update, floa
std::cerr << "Object " << reader->name() << " in
Alembic file " << data->filename << " is invalid.\n";
}
- *data->progress = 0.1f + 0.6f * (++i / size);
+ *data->progress = 0.1f + 0.3f * (++i / size);
*data->do_update = true;
if (G.is_break) {
@@ -703,7 +703,7 @@ static void import_startjob(void *user_data, short *stop,
short *do_update, floa
}
}
- *data->progress = 0.7f + 0.3f * (++i / size);
+ *data->progress = 0.4f + 0.3f * (++i / size);
*data->do_update = true;
if (G.is_break) {
@@ -713,9 +713,18 @@ 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)
{
AbcObjectReader *reader = *iter;
reader->setupObjectTransform(0.0f);
+
+ *data->progress = 0.7f + 0.3f * (++i / size);
+ *data->do_update = true;
+
+ if (G.is_break) {
+ data->was_cancelled = true;
+ return;
+ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
