From 37889011070ff2ec52159690f652238d2b325185 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Sun, 26 Jan 2020 16:35:58 +0100
Subject: Cleanup: fix compiler warnings

---
 source/blender/blenkernel/intern/seqprefetch.c | 4 +---
 source/blender/blenkernel/intern/shrinkwrap.c  | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'source/blender/blenkernel/intern')

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;
-- 
cgit v1.2.3