merge
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
beginning of hook of AudioInjector into JS
replace QVariantMap glm::vec3 setters with conversions for QScriptValue
add methods to set/get samples and volume
Load mapping and use it for offset, joint mappings, blendshape mappings.
fixed behavior of voxel delete and some cases of voxel add in fast pipeline mode
Fixed incorrect capitalization.
Need to allow multiple blendshape mappings per shape index.
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #1013 from ey6es/master

Use Faceshift mapping files (FST) when present for their transform offsets and joint/blendshape mapping.  Fixed crash on meshes with no texture coordinates.
Merge branch 'master' of https://github.com/worklist/hifi into voxel_render_pipeline_improvement
Fix for relative texture paths.
Merge pull request #1014 from ey6es/master

Fix for relative texture paths.
fix build buster
Merge pull request #1015 from ZappoMan/voxel_render_pipeline_improvement

Fixes to delete/add voxel sometimes not rendering
Apply (some) FBX material properties to rendered meshes.