[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58240] trunk/blender/source/blender/ collada: Removed unused paramter from ArmatureImporter:add_joint()

Gaia Clary gaia.clary at machinimatrix.org
Sun Jul 14 18:24:42 CEST 2013


Revision: 58240
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58240
Author:   gaiaclary
Date:     2013-07-14 16:24:42 +0000 (Sun, 14 Jul 2013)
Log Message:
-----------
Removed unused paramter from ArmatureImporter:add_joint()

Modified Paths:
--------------
    trunk/blender/source/blender/collada/ArmatureImporter.cpp
    trunk/blender/source/blender/collada/ArmatureImporter.h
    trunk/blender/source/blender/collada/DocumentImporter.cpp

Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp	2013-07-14 16:21:35 UTC (rev 58239)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp	2013-07-14 16:24:42 UTC (rev 58240)
@@ -517,7 +517,7 @@
 // root - if this joint is the top joint in hierarchy, if a joint
 // is a child of a node (not joint), root should be true since
 // this is where we build armature bones from
-void ArmatureImporter::add_joint(COLLADAFW::Node *node, bool root, Object *parent, Scene *sce)
+void ArmatureImporter::add_joint(COLLADAFW::Node *node, bool root, Object *parent)
 {
 	joint_by_uid[node->getUniqueId()] = node;
 	if (root) {

Modified: trunk/blender/source/blender/collada/ArmatureImporter.h
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.h	2013-07-14 16:21:35 UTC (rev 58239)
+++ trunk/blender/source/blender/collada/ArmatureImporter.h	2013-07-14 16:24:42 UTC (rev 58240)
@@ -140,7 +140,7 @@
 	ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Scene *sce);
 	~ArmatureImporter();
 
-	void add_joint(COLLADAFW::Node *node, bool root, Object *parent, Scene *sce);
+	void add_joint(COLLADAFW::Node *node, bool root, Object *parent);
 
 #if 0
 	void add_root_joint(COLLADAFW::Node *node);

Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp	2013-07-14 16:21:35 UTC (rev 58239)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp	2013-07-14 16:24:42 UTC (rev 58240)
@@ -480,7 +480,7 @@
 			object_map.insert(std::pair<COLLADAFW::UniqueId, Object *>(node->getUniqueId(), par));
 			node_map[node->getUniqueId()] = node;
 		}
-		armature_importer.add_joint(node, parent_node == NULL || parent_node->getType() != COLLADAFW::Node::JOINT, par, sce);
+		armature_importer.add_joint(node, parent_node == NULL || parent_node->getType() != COLLADAFW::Node::JOINT, par);
 
 		if (parent_node == NULL) {
 			// for skeletons without root node all has been done above.




More information about the Bf-blender-cvs mailing list