[Bf-blender-cvs] [bf1b323b154] master: DRW: Fix wrong test condition
Clément Foucault
noreply at git.blender.org
Tue Mar 10 04:47:40 CET 2020
Commit: bf1b323b154433ab4701a7ab455cdecaa3867819
Author: Clément Foucault
Date: Tue Mar 10 02:03:26 2020 +0100
Branches: master
https://developer.blender.org/rBbf1b323b154433ab4701a7ab455cdecaa3867819
DRW: Fix wrong test condition
Fixes the warning: address of array 'cmd->draw.batch->inst' will
always evaluate to 'true'
===================================================================
M source/blender/draw/intern/draw_manager_exec.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 49c71a3f212..85525ea7b55 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -1345,7 +1345,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
break;
case DRW_CMD_DRAW:
if (!USE_BATCHING || state.obmats_loc == -1 || (G.f & G_FLAG_PICKSEL) ||
- cmd->draw.batch->inst) {
+ cmd->draw.batch->inst[0]) {
draw_call_single_do(
shgroup, &state, cmd->draw.batch, cmd->draw.handle, 0, 0, 0, 0, true);
}
More information about the Bf-blender-cvs
mailing list