[Bf-blender-cvs] [226b6e60b91] blender2.8: Fix draw manager draw-modes interfering with eachother

Campbell Barton noreply at git.blender.org
Thu Apr 27 21:21:11 CEST 2017


Commit: 226b6e60b912b9923535bcda1618082959849f9d
Author: Campbell Barton
Date:   Fri Apr 28 05:22:30 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB226b6e60b912b9923535bcda1618082959849f9d

Fix draw manager draw-modes interfering with eachother

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

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 0748d37b6ea..242fae1e284 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1270,6 +1270,11 @@ static void draw_shgroup(DRWShadingGroup *shgroup)
 			draw_geometry(shgroup, call->geometry, call->obmat);
 		}
 	}
+
+	/* reset the state for the next group, note - we could only reset states we changed! */
+	if (shgroup->state != 0) {
+		DRW_state_reset();
+	}
 }
 
 void DRW_draw_pass(DRWPass *pass)




More information about the Bf-blender-cvs mailing list