[Bf-blender-cvs] [496a354d7f0] blender2.8: DRW : Fix Compiler Warning
Clément Foucault
noreply at git.blender.org
Tue Sep 26 13:44:21 CEST 2017
Commit: 496a354d7f009e437d0b4a0c782d00f46af09994
Author: Clément Foucault
Date: Tue Sep 26 13:59:31 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB496a354d7f009e437d0b4a0c782d00f46af09994
DRW : Fix Compiler Warning
===================================================================
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index eb19f99802a..fab2df680ea 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1724,12 +1724,10 @@ static void draw_geometry_prepare(
? viewport_matrix_override.mat[DRW_MAT_VIEWINV] : rv3d->viewinv;
winmat = (viewport_matrix_override.override[DRW_MAT_WIN])
? viewport_matrix_override.mat[DRW_MAT_WIN] : rv3d->winmat;
+ wininv = viewport_matrix_override.mat[DRW_MAT_WININV];
if (do_pi) {
- if (viewport_matrix_override.override[DRW_MAT_WININV]) {
- wininv = viewport_matrix_override.mat[DRW_MAT_WININV];
- }
- else {
+ if (!viewport_matrix_override.override[DRW_MAT_WININV]) {
invert_m4_m4(pi, winmat);
wininv = pi;
}
@@ -2291,8 +2289,8 @@ void DRW_framebuffer_init(
if (!is_depth) {
++color_attachment;
}
- drw_texture_set_parameters(*fbotex.tex, fbotex.flag);
GPU_framebuffer_texture_attach(*fb, *fbotex.tex, color_attachment, 0);
+ drw_texture_set_parameters(*fbotex.tex, fbotex.flag);
}
}
More information about the Bf-blender-cvs
mailing list