[Bf-blender-cvs] [5d0665d4351] blender2.8: DRW: DRWCallState: Fix matflag being overwritten by other engines.

[Clément Foucault]

Commit: 5d0665d4351e1efe2a82a27aabc2a84cdf58b149
Author: Clément Foucault
Date:   Thu Mar 1 03:40:14 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB5d0665d4351e1efe2a82a27aabc2a84cdf58b149

DRW: DRWCallState: Fix matflag being overwritten by other engines.

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

M	source/blender/draw/intern/draw_manager_data.c

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

diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 4b7b60c17a5..264f0ef6d33 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -282,6 +282,10 @@ static DRWCallState *drw_call_state_object(DRWShadingGroup *shgroup, float (*obm
 	if (DST.ob_state == NULL) {
 		DST.ob_state = drw_call_state_create(shgroup, obmat, ob_data);
 	}
+	else {
+		/* If the DRWCallState is reused, add necessary matrices. */
+		DST.ob_state->matflag |= shgroup->matflag;
+	}
 
 	return DST.ob_state;
 }