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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-27 19:30:51 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-27 20:11:19 +0300
commitb2c92d90c8f713b90180f5d4652c5e831fa8e506 (patch)
treee835506deab257072fe75afae1e749c4dadf4a8d
parentc187fc09b6129f31c4e856227adcf5d1224cfde3 (diff)
Cleanup: fix compiler warnings
-rw-r--r--source/blender/draw/engines/eevee/eevee_volumes.c1
-rw-r--r--source/blender/draw/modes/object_mode.c3
2 files changed, 3 insertions, 1 deletions
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;