FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build and warning fixes

Browse Source
This commit is contained in:
Laurens Voerman 2016-06-06 17:54:29 +01:00 committed by Robert Osfield
parent 357f76ba5a
commit 15e9484ff2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeModules/FindFBX.cmake
View File

@ -20,8 +20,10 @@ ELSEIF(MSVC10)
SET(FBX_LIBDIR "vs2010")
ELSEIF(MSVC11)
SET(FBX_LIBDIR "vs2012")
ELSEIF(MSVC12 OR MSVC_VERSION>1800)
ELSEIF(MSVC12 OR MSVC_VERSION==1800)
SET(FBX_LIBDIR "vs2013")
ELSEIF(MSVC14 OR MSVC_VERSION>1900)
SET(FBX_LIBDIR "vs2015")
ENDIF()
IF(APPLE)
@ -48,6 +50,8 @@ SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d)
SET( FBX_SEARCH_PATHS
$ENV{FBX_DIR}
"$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2016.1.1"
"$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2016.1.1"
"$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2015.1"
"$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2015.1"
"/Applications/Autodesk/FBX/FBX SDK/2015.1"

4
src/osgPlugins/fbx/WriterCompareTriangle.cpp
View File

@ -20,8 +20,8 @@ WriterCompareTriangle::operator()(const std::pair<Triangle, int>& t1,
if (t1.second != t2.second)
{
const osg::Geometry* g = geode.getDrawable( t2.second )->asGeometry();
vecs = static_cast<const osg::Vec3Array*>(g->getVertexArray());
const osg::Geometry* g2 = geode.getDrawable( t2.second )->asGeometry();
vecs = static_cast<const osg::Vec3Array*>(g2->getVertexArray());
}
const osg::Vec3::value_type x2 = (*vecs)[t2.first.t1].x();
const osg::Vec3::value_type y2 = (*vecs)[t2.first.t1].y();