layers: MR82, merge-related fixes
authorMark Lobodzinski <mark@lunarg.com>
Wed, 6 Jan 2016 21:58:59 +0000 (14:58 -0700)
committerMark Lobodzinski <mark@lunarg.com>
Wed, 6 Jan 2016 22:01:11 +0000 (15:01 -0700)
commita774a3a992b7380d6d38cd9bdc63658261ae672a
tree081c575b68a9eb007133a9d51cf66e86799a9e0f
parent4e33108b1a5360cf18ad386e9f165ad9266abbee
layers: MR82, merge-related fixes
layers/draw_state.cpp