v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1119 from rdb/master 

Replace use of nullptr in headers with NULL
pull/1130/head
Kim Kulling 2016-12-28 18:20:50 +01:00 committed by GitHub
parent 098b4dd2a6 5bb35f3af6
commit 161cdd4038
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/assimp/anim.h
View File

@ -377,9 +377,9 @@ struct aiAnimation {
: mDuration(-1.) : mDuration(-1.)
, mTicksPerSecond(0.) , mTicksPerSecond(0.)
, mNumChannels(0) , mNumChannels(0)
, mChannels(nullptr) , mChannels(NULL)
, mNumMeshChannels(0) , mNumMeshChannels(0)
, mMeshChannels(nullptr) { , mMeshChannels(NULL) {
// empty // empty
} }

2
include/assimp/metadata.h
View File

@ -187,7 +187,7 @@ struct aiMetadata {
static inline static inline
aiMetadata *Alloc( unsigned int numProperties ) { aiMetadata *Alloc( unsigned int numProperties ) {
if ( 0 == numProperties ) { if ( 0 == numProperties ) {
return nullptr; return NULL;
} }
aiMetadata *data = new aiMetadata; aiMetadata *data = new aiMetadata;