diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-06 14:06:46 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-06 14:06:46 +0300 |
| commit | d2e1a14a570b899c528fdcbc54396a0d58d0a28b (patch) | |
| tree | 7982b6e66fc406fd0221a7a3ff1d95000ef5b3a2 /source | |
| parent | fe73c1299018991397fac3cf4df570f2eebf5ab3 (diff) | |
Fix Collada: nullptr is a c++11 keyword. Changed to NULL
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 7a557a42123..334dff20d52 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -592,7 +592,7 @@ void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& list BLI_strncpy(rna_path, anim_type, sizeof(rna_path)); const COLLADAFW::AnimationList *animlist = animlist_map[listid]; - if (animlist == nullptr) + if (animlist == NULL) { fprintf(stderr, "Collada: No animlist found for ID: %s of type %s\n", listid.toAscii().c_str(), anim_type); return; |