Change PrimitiveType to constants
Merge branch 'renderertweaks' into gltf