[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47871] branches/soc-2012-bratwurst/source /blender/collada/SceneExporter.cpp: Remove remaining merge conflict marker and fix an error caused by renaming of a variable .

[Antony Riakiotakis]

Revision: 47871
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47871
Author:   psy-fi
Date:     2012-06-14 08:24:51 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
Remove remaining merge conflict marker and fix an error caused by renaming of a variable. Needs check by Phabtar!

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/collada/SceneExporter.cpp

Modified: branches/soc-2012-bratwurst/source/blender/collada/SceneExporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/collada/SceneExporter.cpp	2012-06-14 08:02:45 UTC (rev 47870)
+++ branches/soc-2012-bratwurst/source/blender/collada/SceneExporter.cpp	2012-06-14 08:24:51 UTC (rev 47871)
@@ -176,22 +176,21 @@
 		colladaNode.end();
 	}
 
-<<<<<<< .working
 	if (ob->constraints.first != NULL ){
 		bConstraint *con = (bConstraint*) ob->constraints.first;
 		while(con){
 			std::string con_name(id_name(con));
 			std::string con_tag = con_name + "_constraint";
-			node.addExtraTechniqueChildParameter("blender",con_tag,"type",con->type);
-			node.addExtraTechniqueChildParameter("blender",con_tag,"enforce",con->enforce);
-			node.addExtraTechniqueChildParameter("blender",con_tag,"flag",con->flag);
-			node.addExtraTechniqueChildParameter("blender",con_tag,"headtail",con->headtail);
-			node.addExtraTechniqueChildParameter("blender",con_tag,"lin_error",con->lin_error);
+			colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"type",con->type);
+			colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"enforce",con->enforce);
+			colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"flag",con->flag);
+			colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"headtail",con->headtail);
+			colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"lin_error",con->lin_error);
 			/*node.addExtraTechniqueParameter("blender","lin_error",con->next);*/
-			node.addExtraTechniqueChildParameter("blender",con_tag,"own_space",con->ownspace);
-			node.addExtraTechniqueChildParameter("blender",con_tag,"rot_error",con->rot_error);
-			node.addExtraTechniqueChildParameter("blender",con_tag,"tar_space",con->tarspace);
-			node.addExtraTechniqueChildParameter("blender",con_tag,"lin_error",con->lin_error);
+			colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"own_space",con->ownspace);
+			colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"rot_error",con->rot_error);
+			colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"tar_space",con->tarspace);
+			colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"lin_error",con->lin_error);
 
 			con = con->next;
 		}
@@ -205,6 +204,6 @@
 	}
 
 	if (ob->type != OB_ARMATURE)
-		node.end();
+		colladaNode.end();
 }