resolve type issues caused by partial merging

Signed-off-by: Tim Deubler <tim.deubler@here.com>

Author: TerminalTim

packages/core/src/styles/ModelStyle.ts

@@ -121,6 +121,9 @@ export interface Material {
      * @defaultValue 1
      */
     opacity?: number;
+
+    useUVMapping?: boolean;
+    flipY?: boolean;
 }
 
 /**

packages/display/src/displays/webgl/buffer/ModelFactory.ts

@@ -19,7 +19,7 @@
 import {Texture, TextureOptions} from '../Texture';
 import {ModelBuffer} from './templates/ModelBuffer';
 import {TemplateBufferBucket} from './templates/TemplateBufferBucket';
-import {ModelData} from '@here/xyz-maps-core';
+import {ModelData, Material} from '@here/xyz-maps-core';
 import {ObjParser} from '../ObjParser';
 import {vec3} from '@here/xyz-maps-common';