Merge pull request #694 from OtgerRP/master

Support for FBX embedded textures

include/assimp/config.h

@@ -561,6 +561,15 @@ enum aiComponent
 #define AI_CONFIG_IMPORT_FBX_READ_MATERIALS \
     "IMPORT_FBX_READ_MATERIALS"
 
+// ---------------------------------------------------------------------------
+/** @brief Set whether the fbx importer will read embedded textures.
+ *
+ * The default value is true (1)
+ * Property type: bool
+ */
+#define AI_CONFIG_IMPORT_FBX_READ_TEXTURES \
+    "IMPORT_FBX_READ_TEXTURES"
+
 // ---------------------------------------------------------------------------
 /** @brief Set whether the fbx importer will read cameras.
  *

include/assimp/texture.h

@@ -116,6 +116,10 @@ struct aiTexel
  * 2. Compressed textures stored in a file format like png or jpg. The raw file
  * bytes are given so the application must utilize an image decoder (e.g. DevIL) to
  * get access to the actual color data.
+ *
+ * Embedded textures are referenced from materials using strings like "*0", "*1", etc.
+ * as the texture paths (a single asterisk character followed by the
+ * zero-based index of the texture in the aiScene::mTextures array).
  */
 struct aiTexture
 {