[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39040] branches/soc-2011-pepper/source/ blender/blenloader/intern/readfile.c: BGE Animations: Moving the do_versions code for the actuators back into the " put compatibility code here until next subversion bump" block.

[Mitchell Stokes]

Revision: 39040
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39040
Author:   moguri
Date:     2011-08-05 01:21:08 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
BGE Animations: Moving the do_versions code for the actuators back into the "put compatibility code here until next subversion bump" block. It got sucked into the 2.58.1 block during a merge sometime.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c

Modified: branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c	2011-08-05 00:51:44 UTC (rev 39039)
+++ branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c	2011-08-05 01:21:08 UTC (rev 39040)
@@ -11733,46 +11733,7 @@
 				}
 			}
 		}
-		
-		{
-			/* convert fcurve and shape action actuators to action actuators */
-			Object *ob;
-			bActuator *act;
-			bIpoActuator *ia;
-			bActionActuator *aa;
 
-			for (ob= main->object.first; ob; ob= ob->id.next) {
-				for (act= ob->actuators.first; act; act= act->next) {
-					if (act->type == ACT_IPO) {
-						// Create the new actuator
-						ia= act->data;
-						aa= MEM_callocN(sizeof(bActionActuator), "fcurve -> action actuator do_version");
-
-						// Copy values
-						aa->type = ia->type;
-						aa->flag = ia->flag;
-						aa->sta = ia->sta;
-						aa->end = ia->end;
-						strcpy(aa->name, ia->name);
-						strcpy(aa->frameProp, ia->frameProp);
-						if (ob->adt)
-							aa->act = ob->adt->action;
-
-						// Get rid of the old actuator
-						MEM_freeN(ia);
-
-						// Assign the new actuator
-						act->data = aa;
-						act->type= act->otype= ACT_ACTION;
-						
-					}
-					else if (act->type == ACT_SHAPEACTION)  {
-						act->type = act->otype = ACT_ACTION;
-					}
-				}
-			}
-		}
-
 		{
 			ParticleSettings *part;
 			for(part = main->particle.first; part; part = part->id.next) {
@@ -11831,6 +11792,44 @@
 				}
 			}
 		}
+		{
+			/* convert fcurve and shape action actuators to action actuators */
+			Object *ob;
+			bActuator *act;
+			bIpoActuator *ia;
+			bActionActuator *aa;
+
+			for (ob= main->object.first; ob; ob= ob->id.next) {
+				for (act= ob->actuators.first; act; act= act->next) {
+					if (act->type == ACT_IPO) {
+						// Create the new actuator
+						ia= act->data;
+						aa= MEM_callocN(sizeof(bActionActuator), "fcurve -> action actuator do_version");
+
+						// Copy values
+						aa->type = ia->type;
+						aa->flag = ia->flag;
+						aa->sta = ia->sta;
+						aa->end = ia->end;
+						strcpy(aa->name, ia->name);
+						strcpy(aa->frameProp, ia->frameProp);
+						if (ob->adt)
+							aa->act = ob->adt->action;
+
+						// Get rid of the old actuator
+						MEM_freeN(ia);
+
+						// Assign the new actuator
+						act->data = aa;
+						act->type= act->otype= ACT_ACTION;
+						
+					}
+					else if (act->type == ACT_SHAPEACTION)  {
+						act->type = act->otype = ACT_ACTION;
+					}
+				}
+			}
+		}
 	}
 	
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */