diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-27 14:26:18 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-27 14:26:18 +0300 |
commit | aabf4d407695d0f2dbac0baa55bf1631e408eda9 (patch) | |
tree | 5ccb354f8f400cae37747f473dda6af6c15578d5 /source/blender/blenkernel/intern | |
parent | 5c75c8d8d0bdc24fef1450a4e40c676977217fb6 (diff) | |
parent | 37889011070ff2ec52159690f652238d2b325185 (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/seqprefetch.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/seqprefetch.c b/source/blender/blenkernel/intern/seqprefetch.c index 6dd1c47407f..8c9097e1d4e 100644 --- a/source/blender/blenkernel/intern/seqprefetch.c +++ b/source/blender/blenkernel/intern/seqprefetch.c @@ -416,9 +416,7 @@ static PrefetchJob *seq_prefetch_start(const SeqRenderData *context, float cfra) pfjob->stop = false; pfjob->running = true; - if (&pfjob->threads) { - BLI_threadpool_remove(&pfjob->threads, pfjob); - } + BLI_threadpool_remove(&pfjob->threads, pfjob); BLI_threadpool_insert(&pfjob->threads, pfjob); return pfjob; diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index a2699e767e9..49a295c6a9e 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -1511,7 +1511,7 @@ void BKE_shrinkwrap_mesh_nearest_surface_deform(struct bContext *C, { Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); struct Scene *sce = CTX_data_scene(C); - ShrinkwrapModifierData ssmd = {0}; + ShrinkwrapModifierData ssmd = {{0}}; ModifierEvalContext ctx = {depsgraph, ob_source, 0}; int totvert; @@ -1532,7 +1532,7 @@ void BKE_shrinkwrap_mesh_nearest_surface_deform(struct bContext *C, void BKE_shrinkwrap_remesh_target_project(Mesh *src_me, Mesh *target_me, Object *ob_target) { - ShrinkwrapModifierData ssmd = {0}; + ShrinkwrapModifierData ssmd = {{0}}; int totvert; ssmd.target = ob_target; |