Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-12-03 11:12:29 +0300
committerAntonioya <blendergit@gmail.com>2018-12-03 11:12:29 +0300
commit63d0ea8ecf488e330a6717365b685e1339498fdb (patch)
treebc3b1af7885f791548cd7f8b753e3e248c2f1eb4
parent599f6c791af723894c995850e4590ecf6a23f6ab (diff)
Fix T58535 Crash on Load
The particles was not ready when the drawing cache try to use it.
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_draw_utils.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 932a6cc3df0..eaae8033b8b 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1625,7 +1625,9 @@ void DRW_gpencil_populate_particles(GPENCIL_e_data *e_data, void *vedata)
Object *ob = cache_ob->ob;
if (cache_ob->is_dup_ob) {
GpencilBatchCache *cache = ob->runtime.gpencil_cache;
- DRW_gpencil_shgroups_create(e_data, vedata, ob, cache, cache_ob);
+ if (cache != NULL) {
+ DRW_gpencil_shgroups_create(e_data, vedata, ob, cache, cache_ob);
+ }
}
}
}