[Bf-blender-cvs] [d2e1a14a570] master: Fix Collada: nullptr is a c++11 keyword. Changed to NULL
Gaia Clary
noreply at git.blender.org
Fri Apr 6 13:08:02 CEST 2018
Commit: d2e1a14a570b899c528fdcbc54396a0d58d0a28b
Author: Gaia Clary
Date: Fri Apr 6 13:06:46 2018 +0200
Branches: master
https://developer.blender.org/rBd2e1a14a570b899c528fdcbc54396a0d58d0a28b
Fix Collada: nullptr is a c++11 keyword. Changed to NULL
===================================================================
M source/blender/collada/AnimationImporter.cpp
===================================================================
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;
More information about the Bf-blender-cvs
mailing list