Commit graph

11 commits

Author SHA1 Message Date
Brad Hefta-Gaub
b95e4e1e93 Merge pull request #5323 from MarcelEdward/20605
Removed the  line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Seth Alves
6ba135de09 when creating a walking surface collision hull from a flat mesh, ignore triangles with a normal that's not mostly up or down 2015-07-24 07:16:40 -07:00
Marcel Verhagen
8f0893ba21 Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.

So it now does not break existing content.

Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
2015-07-22 22:34:45 +02:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
David Rowe
a01830f8f8 Fix some double to float conversion warnings in Windows builds 2015-05-22 12:32:02 -07:00
Howard Stearns
4090f892b2 Merge remote-tracking branch 'upstream/master' into objReader 2015-05-05 14:58:18 -07:00
Seth Alves
b2583298a9 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-05-03 10:45:55 -07:00
Howard Stearns
242001a589 Restore some very odd modularity used by VHACDUtil. 2015-04-29 22:17:44 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00