[Bf-blender-cvs] [4db3916b60d] master: refactor collada: rename add_node_transform() to add_joint_transform()

Gaia Clary noreply at git.blender.org
Mon May 27 16:00:46 CEST 2019


Commit: 4db3916b60da565f11cb73d905458d66d0347c8a
Author: Gaia Clary
Date:   Mon May 27 15:02:11 2019 +0200
Branches: master
https://developer.blender.org/rB4db3916b60da565f11cb73d905458d66d0347c8a

refactor collada: rename add_node_transform() to add_joint_transform()

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

M	source/blender/collada/ArmatureExporter.cpp
M	source/blender/collada/TransformWriter.cpp
M	source/blender/collada/TransformWriter.h

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

diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp
index 1288a5c7768..49d938fc61d 100644
--- a/source/blender/collada/ArmatureExporter.cpp
+++ b/source/blender/collada/ArmatureExporter.cpp
@@ -318,7 +318,7 @@ void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW:
     bc_sanitize_mat(mat, LIMITTED_PRECISION);
   }
 
-  TransformWriter::add_node_transform(node, mat, NULL, this->export_settings, has_restmat);
+  TransformWriter::add_joint_transform(node, mat, NULL, this->export_settings, has_restmat);
 }
 
 std::string ArmatureExporter::get_controller_id(Object *ob_arm, Object *ob)
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index 1fe0c1d4494..965338a9fd8 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -25,7 +25,7 @@
 
 #include "TransformWriter.h"
 
-void TransformWriter::add_node_transform(COLLADASW::Node &node,
+void TransformWriter::add_joint_transform(COLLADASW::Node &node,
                                          float mat[4][4],
                                          float parent_mat[4][4],
                                          BCExportSettings &export_settings,
diff --git a/source/blender/collada/TransformWriter.h b/source/blender/collada/TransformWriter.h
index 1382b9a901f..e12c2053594 100644
--- a/source/blender/collada/TransformWriter.h
+++ b/source/blender/collada/TransformWriter.h
@@ -31,7 +31,7 @@
 
 class TransformWriter {
  protected:
-  void add_node_transform(COLLADASW::Node &node,
+  void add_joint_transform(COLLADASW::Node &node,
                           float mat[4][4],
                           float parent_mat[4][4],
                           BCExportSettings &export_settings,



More information about the Bf-blender-cvs mailing list