Fix modelMatrix in Primitive constructor
Merge branch 'primitive-modelmatrix' into goodness