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:
authorMike Erwin <significant.bit@gmail.com>2017-03-30 08:43:51 +0300
committerMike Erwin <significant.bit@gmail.com>2017-03-30 08:43:51 +0300
commit0dc30e9dd8daab7c5afd833bf117c4838bf6100d (patch)
treeca4c087b2230e8d4fc5b75c5fbe030284f50a11d
parent4743fa52ac9545cdd6b815671761081cda10f807 (diff)
fix build on Mac/clang
Not all code paths returned a value, so we can use a safe default (8-bit RGBA) when the input is bogus.
-rw-r--r--source/blender/draw/intern/draw_manager.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 8eafeb8b749..efa677240dd 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1273,6 +1273,7 @@ static GPUTextureFormat convert_tex_format(int fbo_format, int *channels)
case DRW_BUF_DEPTH_24: *channels = 1; return GPU_DEPTH_COMPONENT24;
default:
BLI_assert(false);
+ *channels = 4; return GPU_RGBA8;
}
}