Merge branch 'awoloszyn-fix-IDs' into 'master'
authorPyry Haulos <phaulos@google.com>
Wed, 13 Jan 2016 20:16:17 +0000 (15:16 -0500)
committerPyry Haulos <phaulos@google.com>
Wed, 13 Jan 2016 20:16:17 +0000 (15:16 -0500)
Replaced uses of VertexID and InstanceID.

Switched to using InstanceIndex and VertexIndex.

See merge request !297


Trivial merge