[Bf-blender-cvs] [61d03470c90] temp-sybren-usd-patch-02: USD: also stop job when `*stop = true`
Sybren A. Stüvel
noreply at git.blender.org
Thu Nov 28 17:55:08 CET 2019
Commit: 61d03470c90e615749cb89c9ff7fe581fb96d367
Author: Sybren A. Stüvel
Date: Tue Nov 26 12:08:59 2019 +0100
Branches: temp-sybren-usd-patch-02
https://developer.blender.org/rB61d03470c90e615749cb89c9ff7fe581fb96d367
USD: also stop job when `*stop = true`
===================================================================
M source/blender/usd/intern/usd_capi.cc
===================================================================
diff --git a/source/blender/usd/intern/usd_capi.cc b/source/blender/usd/intern/usd_capi.cc
index 221f44be2a6..835562a5dbf 100644
--- a/source/blender/usd/intern/usd_capi.cc
+++ b/source/blender/usd/intern/usd_capi.cc
@@ -108,7 +108,7 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo
float progress_per_frame = 0.8f / std::max(1, (scene->r.efra - scene->r.sfra + 1));
for (float frame = scene->r.sfra; frame <= scene->r.efra; frame++) {
- if (G.is_break) {
+ if (G.is_break || (stop != nullptr && *stop)) {
break;
}
More information about the Bf-blender-cvs
mailing list