Commit: 65b31a4c9c1e0e4c7e4cd8b4c92e3554908a17c7
Author: Antonioya
Date: Wed Aug 8 11:09:12 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB65b31a4c9c1e0e4c7e4cd8b4c92e3554908a17c7
GP: Check render status before use it.
===================================================================
M source/blender/draw/engines/gpencil/gpencil_engine.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c
b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 3f64d72d354..7bb6e528678 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -331,6 +331,9 @@ void GPENCIL_cache_init(void *vedata)
if (draw_ctx->evil_C) {
stl->storage->is_playing =
ED_screen_animation_playing(CTX_wm_manager(draw_ctx->evil_C)) != NULL;
}
+ /* save render state */
+ stl->storage->is_render = DRW_state_is_image_render();
+ stl->storage->is_mat_preview = (bool)stl->storage->is_render &&
STREQ(scene->id.name + 2, "preview");
if (obact_gpd) {
/* for some reason, when press play there is a delay in
the animation flag check
@@ -346,10 +349,6 @@ void GPENCIL_cache_init(void *vedata)
}
}
- /* save render state */
- stl->storage->is_render = DRW_state_is_image_render();
- stl->storage->is_mat_preview = (bool)stl->storage->is_render &&
STREQ(scene->id.name + 2, "preview");
-
/* save simplify flags (can change while drawing, so it's
better to save) */
stl->storage->simplify_fill = GP_SIMPLIFY_FILL(scene,
stl->storage->is_playing);
stl->storage->simplify_modif = GP_SIMPLIFY_MODIF(scene,
stl->storage->is_playing);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
