Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/io/collada/ArmatureImporter.cpp2
-rw-r--r--source/blender/io/collada/collada_utils.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp
index 56716722b46..7eef5c3f5fb 100644
--- a/source/blender/io/collada/ArmatureImporter.cpp
+++ b/source/blender/io/collada/ArmatureImporter.cpp
@@ -1037,7 +1037,7 @@ void ArmatureImporter::get_rna_path_for_joint(COLLADAFW::Node *node,
char *joint_path,
size_t count)
{
- char bone_name_esc[sizeof(((Bone *)NULL)->name) * 2];
+ char bone_name_esc[sizeof(((Bone *)nullptr)->name) * 2];
BLI_str_escape(bone_name_esc, bc_get_joint_name(node), sizeof(bone_name_esc));
BLI_snprintf(joint_path, count, "pose.bones[\"%s\"]", bone_name_esc);
}
diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp
index 3c68de70248..bba50064879 100644
--- a/source/blender/io/collada/collada_utils.cpp
+++ b/source/blender/io/collada/collada_utils.cpp
@@ -832,7 +832,7 @@ void bc_enable_fcurves(bAction *act, char *bone_name)
char prefix[200];
if (bone_name) {
- char bone_name_esc[sizeof(((Bone *)NULL)->name) * 2];
+ char bone_name_esc[sizeof(((Bone *)nullptr)->name) * 2];
BLI_str_escape(bone_name_esc, bone_name, sizeof(bone_name_esc));
BLI_snprintf(prefix, sizeof(prefix), "pose.bones[\"%s\"]", bone_name_esc);
}