[Bf-blender-cvs] [fe9c8be208] temp-sybren-alembic: Alembic import: nicer progress updates
Sybren A. Stüvel
noreply at git.blender.org
Fri Feb 24 17:06:16 CET 2017
Commit: fe9c8be208e6e14554c99bb35dacbc70323f700a
Author: Sybren A. Stüvel
Date: Thu Feb 23 16:19:14 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rBfe9c8be208e6e14554c99bb35dacbc70323f700a
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 1e34de0500..d2ecfbf81f 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -663,7 +663,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) {
@@ -719,7 +719,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) {
@@ -729,9 +729,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;
+ }
}
}
More information about the Bf-blender-cvs
mailing list