From d2e1a14a570b899c528fdcbc54396a0d58d0a28b Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Fri, 6 Apr 2018 13:06:46 +0200 Subject: Fix Collada: nullptr is a c++11 keyword. Changed to NULL --- source/blender/collada/AnimationImporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3