Merge branch 'master' into hl1-mdl-fix-texture-format

2020-01-27 18:01:03 -05:00 · 2020-01-27 18:01:03 -05:00 · 16d71908d7
parent 5ab67f6491 e41a59ee1f
commit 16d71908d7
55 changed files with 0 additions and 4 deletions
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@ -1213,10 +1213,6 @@ SET_TARGET_PROPERTIES( assimp PROPERTIES
 )

 if (APPLE)
-  SET_TARGET_PROPERTIES( assimp PROPERTIES
-    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR}"
-  )
-
  if (BUILD_FRAMEWORK)
    SET_TARGET_PROPERTIES( assimp PROPERTIES
      FRAMEWORK TRUE
--- a/test/models-nonbsd/3DS/m_rifl.bmp
+++ b/test/models-nonbsd/3DS/m_rifl.bmp
--- a/test/models-nonbsd/AMF/screenshot_3_bananas.jpeg
+++ b/test/models-nonbsd/AMF/screenshot_3_bananas.jpeg
--- a/test/models-nonbsd/B3D/turtle1.png
+++ b/test/models-nonbsd/B3D/turtle1.png
--- a/test/models-nonbsd/FBX/2013_ASCII/duck_sample.jpg
+++ b/test/models-nonbsd/FBX/2013_ASCII/duck_sample.jpg
--- a/test/models-nonbsd/FBX/2013_ASCII/m_rifl.bmp
+++ b/test/models-nonbsd/FBX/2013_ASCII/m_rifl.bmp
--- a/test/models-nonbsd/IRR/skybox/default_skybox3.jpg
+++ b/test/models-nonbsd/IRR/skybox/default_skybox3.jpg
--- a/test/models-nonbsd/IRR/skybox/default_skyboxdn.jpg
+++ b/test/models-nonbsd/IRR/skybox/default_skyboxdn.jpg
--- a/test/models-nonbsd/IRR/skybox/default_skyboxup.jpg
+++ b/test/models-nonbsd/IRR/skybox/default_skyboxup.jpg
--- a/test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/euro_frnt_2.tga
+++ b/test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/euro_frnt_2.tga
--- a/test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt.tga
+++ b/test/models-nonbsd/MD3/q3root/models/mapobjects/kt_kubalwagon/european_fnt.tga
--- a/test/models-nonbsd/MD3/water_can.tga
+++ b/test/models-nonbsd/MD3/water_can.tga
--- a/test/models-nonbsd/MD5/guard1_body.png
+++ b/test/models-nonbsd/MD5/guard1_body.png
--- a/test/models-nonbsd/MD5/guard1_face.png
+++ b/test/models-nonbsd/MD5/guard1_face.png
--- a/test/models-nonbsd/MD5/guard1_helmet.png
+++ b/test/models-nonbsd/MD5/guard1_helmet.png
--- a/test/models-nonbsd/MD5/iron_grill.png
+++ b/test/models-nonbsd/MD5/iron_grill.png
--- a/test/models-nonbsd/MD5/round_grill.png
+++ b/test/models-nonbsd/MD5/round_grill.png
--- a/test/models-nonbsd/MDL/MDL7
+++ b/test/models-nonbsd/MDL/MDL7
--- a/test/models-nonbsd/Ogre/OgreSDK/fish.jpg
+++ b/test/models-nonbsd/Ogre/OgreSDK/fish.jpg
--- a/test/models/3DS/CWALL02.jpg
+++ b/test/models/3DS/CWALL02.jpg
--- a/test/models/3DS/IMAGE2.jpg
+++ b/test/models/3DS/IMAGE2.jpg
--- a/test/models/3DS/UVTransformTest/UVTransformTestImg.png
+++ b/test/models/3DS/UVTransformTest/UVTransformTestImg.png
--- a/test/models/3DS/test.png
+++ b/test/models/3DS/test.png
--- a/test/models/Collada/duck_sample.jpg
+++ b/test/models/Collada/duck_sample.jpg
--- a/test/models/Collada/teapots_reference.png
+++ b/test/models/Collada/teapots_reference.png
--- a/test/models/IRRMesh/1.png
+++ b/test/models/IRRMesh/1.png
--- a/test/models/LWO/LWO2/MappingModes/earthCylindric.jpg
+++ b/test/models/LWO/LWO2/MappingModes/earthCylindric.jpg
--- a/test/models/LWO/LWO2/MappingModes/earthSpherical.jpg
+++ b/test/models/LWO/LWO2/MappingModes/earthSpherical.jpg
--- a/test/models/LWO/LWO2/boxuv.png
+++ b/test/models/LWO/LWO2/boxuv.png
--- a/test/models/LWO/LWO2/uvtest.png
+++ b/test/models/LWO/LWO2/uvtest.png
--- a/test/models/MD2/faerie2.bmp
+++ b/test/models/MD2/faerie2.bmp
--- a/test/models/MD2/sydney.bmp
+++ b/test/models/MD2/sydney.bmp
--- a/test/models/Ogre/TheThing/Reference.JPG
+++ b/test/models/Ogre/TheThing/Reference.JPG
--- a/test/models/ReferenceImages/MappingModes/cylindrical.png
+++ b/test/models/ReferenceImages/MappingModes/cylindrical.png
--- a/test/models/ReferenceImages/MappingModes/spherical.png
+++ b/test/models/ReferenceImages/MappingModes/spherical.png
--- a/test/models/ReferenceImages/UVTransform/UVTransform_Normal.png
+++ b/test/models/ReferenceImages/UVTransform/UVTransform_Normal.png
--- a/test/models/ReferenceImages/UVTransform/UVTransform_OffsetUV0.5-clampUV.png
+++ b/test/models/ReferenceImages/UVTransform/UVTransform_OffsetUV0.5-clampUV.png
--- a/test/models/ReferenceImages/UVTransform/UVTransform_OffsetUV0.5-mirrorUV.png
+++ b/test/models/ReferenceImages/UVTransform/UVTransform_OffsetUV0.5-mirrorUV.png
--- a/test/models/ReferenceImages/UVTransform/UVTransform_OffsetUV0.5.png
+++ b/test/models/ReferenceImages/UVTransform/UVTransform_OffsetUV0.5.png
--- a/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72.png
+++ b/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72.png
--- a/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72_mirrorU.png
+++ b/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV1-2_OffsetUV0-0.9_Rotate-72_mirrorU.png
--- a/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV10-2_OffsetUV10-mirrorUV.png
+++ b/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV10-2_OffsetUV10-mirrorUV.png
--- a/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV2x.png
+++ b/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV2x.png
--- a/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV2x_Rotate45.png
+++ b/test/models/ReferenceImages/UVTransform/UVTransform_ScaleUV2x_Rotate45.png
--- a/test/models/SIB/This
+++ b/test/models/SIB/This
--- a/test/models/SIB/UV
+++ b/test/models/SIB/UV
--- a/test/models/X/bottom.tga
+++ b/test/models/X/bottom.tga
--- a/test/models/X/test.png
+++ b/test/models/X/test.png
--- a/test/models/X/top.tga
+++ b/test/models/X/top.tga
--- a/test/models/glTF/BoxTextured-glTF-MaterialsCommon/CesiumLogoFlat.png
+++ b/test/models/glTF/BoxTextured-glTF-MaterialsCommon/CesiumLogoFlat.png
--- a/test/models/glTF/BoxTextured-glTF/CesiumLogoFlat.png
+++ b/test/models/glTF/BoxTextured-glTF/CesiumLogoFlat.png
--- a/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.png
+++ b/test/models/glTF/CesiumMilkTruck/CesiumMilkTruck.png
--- a/test/models/glTF2/BoxTextured-glTF-pbrSpecularGlossiness/CesiumLogoFlat.png
+++ b/test/models/glTF2/BoxTextured-glTF-pbrSpecularGlossiness/CesiumLogoFlat.png
--- a/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/CesiumLogoFlat.png
+++ b/test/models/glTF2/BoxTextured-glTF-techniqueWebGL/CesiumLogoFlat.png
--- a/test/models/glTF2/BoxTextured-glTF/CesiumLogoFlat.png
+++ b/test/models/glTF2/BoxTextured-glTF/CesiumLogoFlat.png