[Bf-blender-cvs] [b2c92d90c8f] master: Cleanup: fix compiler warnings

[Brecht Van Lommel]

Commit: b2c92d90c8f713b90180f5d4652c5e831fa8e506
Author: Brecht Van Lommel
Date:   Thu Jun 27 18:30:51 2019 +0200
Branches: master
https://developer.blender.org/rBb2c92d90c8f713b90180f5d4652c5e831fa8e506

Cleanup: fix compiler warnings

===================================================================

M	source/blender/draw/engines/eevee/eevee_volumes.c
M	source/blender/draw/modes/object_mode.c

===================================================================

diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 79a133ed7fc..9c8ec6e52a4 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -630,7 +630,6 @@ void EEVEE_volumes_compute(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *veda
 void EEVEE_volumes_resolve(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
 {
   EEVEE_PassList *psl = vedata->psl;
-  EEVEE_TextureList *txl = vedata->txl;
   EEVEE_FramebufferList *fbl = vedata->fbl;
   EEVEE_StorageList *stl = vedata->stl;
   EEVEE_EffectsInfo *effects = stl->effects;
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 330b24f5e1a..68f3e058693 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1212,6 +1212,9 @@ static void DRW_shgroup_camera_background_images(OBJECT_Shaders *sh_data,
         BKE_movieclip_get_size(clip, &bgpic->cuser, &image_width, &image_height);
         image_aspect = (image_width * image_aspect_x) / (image_height * image_aspect_y);
       }
+      else {
+        continue;
+      }
 
       /* ensure link_data is allocated to store matrice */
       CameraEngineBGData *bg_data;