[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39399] branches/soc-2011-pepper/source/ blender/collada: Cleanup

Sukhitha Jayathilake pr.jayathilake at gmail.com
Sun Aug 14 18:13:35 CEST 2011


Revision: 39399
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39399
Author:   phabtar
Date:     2011-08-14 16:13:35 +0000 (Sun, 14 Aug 2011)
Log Message:
-----------
Cleanup

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-pepper/source/blender/collada/AnimationExporter.h

Modified: branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp	2011-08-14 14:43:11 UTC (rev 39398)
+++ branches/soc-2011-pepper/source/blender/collada/AnimationExporter.cpp	2011-08-14 16:13:35 UTC (rev 39399)
@@ -1016,7 +1016,7 @@
 			tm_name = "fall_off_exponent";
 			break;
 		case 4:
-			tm_name = "blender_dist";
+			tm_name = "blender/blender_dist";
 			break;
 		
 		default:
@@ -1137,30 +1137,6 @@
 		return dot ? (dot + 1) : rna_path;
 	}
 
-	void AnimationExporter::find_all_frames(Object *ob, std::vector<float> &fra)
-	{
-		FCurve *fcu= (FCurve*)ob->adt->action->curves.first;
-		std::vector<float> keys;
-		for (unsigned int i = 0; i < fcu->totvert; i++) {
-					float f = fcu->bezt[i].vec[1][0];     //
-					if (std::find(keys.begin(), keys.end(), f) == keys.end())   
-						keys.push_back(f);
-		}
-
-		std::sort(keys.begin(), keys.end());
-		float first, last;
-		std::vector<float>::reference ref = keys.front();
-		first = ref;
-		ref = keys.back();
-		last = ref;
-		for (float i = first ; i != last ; i+=1.0f )
-		{
-			fra.push_back(i); 
-		}
-		return;
-
-	}
-
 	void AnimationExporter::find_frames(Object *ob, std::vector<float> &fra)
 	{
 		FCurve *fcu= (FCurve*)ob->adt->action->curves.first;

Modified: branches/soc-2011-pepper/source/blender/collada/AnimationExporter.h
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/AnimationExporter.h	2011-08-14 14:43:11 UTC (rev 39398)
+++ branches/soc-2011-pepper/source/blender/collada/AnimationExporter.h	2011-08-14 16:13:35 UTC (rev 39399)
@@ -147,8 +147,6 @@
 	void find_frames(Object *ob, std::vector<float> &fra, const char *prefix, const char *tm_name);
 	void find_frames(Object *ob, std::vector<float> &fra);
 
-	void find_all_frames(Object *ob, std::vector<float> &fra);
-	
 	void find_rotation_frames(Object *ob, std::vector<float> &fra, const char *prefix, int rotmode);
 	
 	// enable fcurves driving a specific bone, disable all the rest




More information about the Bf-blender-cvs mailing list