projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a148f1e
)
https://github.com/assimp/assimp/issues/714: fix null pointer access with
author
Kim Kulling
<kim.kulling@googlemail.com>
Sat, 26 Dec 2015 23:19:11 +0000
(
00:19
+0100)
committer
Kim Kulling
<kim.kulling@googlemail.com>
Sat, 26 Dec 2015 23:19:11 +0000
(
00:19
+0100)
unknown texture.
code/ObjFileMtlImporter.cpp
patch
|
blob
|
history
diff --git
a/code/ObjFileMtlImporter.cpp
b/code/ObjFileMtlImporter.cpp
index
6653b30
..
8079dad
100644
(file)
--- a/
code/ObjFileMtlImporter.cpp
+++ b/
code/ObjFileMtlImporter.cpp
@@
-358,7
+358,9
@@
void ObjFileMtlImporter::getTexture() {
std::string texture;
m_DataIt = getName<DataArrayIt>( m_DataIt, m_DataItEnd, texture );
- out->Set( texture );
+ if ( NULL!=out ) {
+ out->Set( texture );
+ }
}
/* /////////////////////////////////////////////////////////////////////////////