Show
Ignore:
Timestamp:
11/21/14 21:16:16 (44 hours ago)
Author:
robert
Message:

From Alberto Luaces,"the current code uses the preprocessor for generating the plugin path in
a way that when CMAKE_INSTALL_PREFIX contains something along the lines
of

/usr/x86_64-linux-gnu/

it gets substituted as

/usr/x86_64-1-gnu/

that is, the string is preprocessed again, thereby making changes to
anything that matches any defined symbol, as "linux" in this example
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763816).

Quoting that path directly in CMake scripts solves that problem.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/fbx/fbxMaterialToOsgStateSet.h

    r12585 r13466  
    6868 
    6969//We use the pointers set by the importer to not duplicate materials and textures. 
    70 typedef std::map<const KFbxSurfaceMaterial *, StateSetContent> FbxMaterialMap; 
     70typedef std::map<const FbxSurfaceMaterial *, StateSetContent> FbxMaterialMap; 
    7171 
    7272//This map is used to not load the same image more than 1 time. 
     
    7676{ 
    7777public: 
    78     //Convert a KfbxSurfaceMaterial to a osgMaterial and an osgTexture. 
    79     StateSetContent convert(const KFbxSurfaceMaterial* pFbxMat); 
     78    //Convert a FbxSurfaceMaterial to a osgMaterial and an osgTexture. 
     79    StateSetContent convert(const FbxSurfaceMaterial* pFbxMat); 
    8080 
    8181    //dir is the directory where fbx is stored (for relative path). 
     
    8989    //Convert a texture fbx to an osg texture. 
    9090    osg::ref_ptr<osg::Texture2D> 
    91     fbxTextureToOsgTexture(const KFbxFileTexture* pOsgTex); 
     91    fbxTextureToOsgTexture(const FbxFileTexture* pOsgTex); 
    9292    FbxMaterialMap       _fbxMaterialMap; 
    9393    ImageMap              _imageMap;