diff options
Diffstat (limited to 'source/blender/io/collada/SkinInfo.cpp')
-rw-r--r-- | source/blender/io/collada/SkinInfo.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/io/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp index eef45a5be90..19a4a4f61c2 100644 --- a/source/blender/io/collada/SkinInfo.cpp +++ b/source/blender/io/collada/SkinInfo.cpp @@ -75,7 +75,7 @@ SkinInfo::SkinInfo(const SkinInfo &skin) transfer_int_array_data_const(skin.joint_indices, joint_indices); } -SkinInfo::SkinInfo(UnitConverter *conv) : unit_converter(conv), ob_arm(NULL), parent(NULL) +SkinInfo::SkinInfo(UnitConverter *conv) : unit_converter(conv), ob_arm(nullptr), parent(nullptr) { } @@ -157,7 +157,7 @@ void SkinInfo::set_controller(const COLLADAFW::SkinController *co) /* called from write_controller */ Object *SkinInfo::create_armature(Main *bmain, Scene *scene, ViewLayer *view_layer) { - ob_arm = bc_add_object(bmain, scene, view_layer, OB_ARMATURE, NULL); + ob_arm = bc_add_object(bmain, scene, view_layer, OB_ARMATURE, nullptr); return ob_arm; } @@ -228,7 +228,8 @@ void SkinInfo::link_armature(bContext *C, Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - ModifierData *md = ED_object_modifier_add(NULL, bmain, scene, ob, NULL, eModifierType_Armature); + ModifierData *md = ED_object_modifier_add( + nullptr, bmain, scene, ob, nullptr, eModifierType_Armature); ArmatureModifierData *amd = (ArmatureModifierData *)md; amd->object = ob_arm; @@ -248,7 +249,7 @@ void SkinInfo::link_armature(bContext *C, DEG_id_tag_update(&obn->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY); #endif copy_m4_m4(ob->obmat, bind_shape_matrix); - BKE_object_apply_mat4(ob, ob->obmat, 0, 0); + BKE_object_apply_mat4(ob, ob->obmat, false, false); amd->deformflag = ARM_DEF_VGROUP; |