[Bf-blender-cvs] [53ed96641c6] master: Cleanup: clang tidy

Jacques Lucke noreply at git.blender.org
Mon Dec 14 10:48:22 CET 2020


Commit: 53ed96641c60531e2ece17230879088df899f8a5
Author: Jacques Lucke
Date:   Mon Dec 14 10:48:11 2020 +0100
Branches: master
https://developer.blender.org/rB53ed96641c60531e2ece17230879088df899f8a5

Cleanup: clang tidy

===================================================================

M	source/blender/io/collada/ArmatureImporter.cpp
M	source/blender/io/collada/collada_utils.cpp

===================================================================

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);
   }



More information about the Bf-blender-cvs mailing list