[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14529] branches/soc-2008-jaguarandi/ source/blender/src/transform_conversions.c: Merge trunk with branch

[André Pinto]

Revision: 14529
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14529
Author:   jaguarandi
Date:     2008-04-23 15:06:53 +0200 (Wed, 23 Apr 2008)

Log Message:
-----------
Merge trunk with branch
svn merge -r 14521:head https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/soc-2008-jaguarandi/source/blender/src/transform_conversions.c

Modified: 
branches/soc-2008-jaguarandi/source/blender/src/transform_conversions.c
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/src/transform_conversions.c     
2008-04-23 12:44:10 UTC (rev 14528)
+++ branches/soc-2008-jaguarandi/source/blender/src/transform_conversions.c     
2008-04-23 13:06:53 UTC (rev 14529)
@@ -3180,9 +3180,10 @@
 void autokeyframe_ob_cb_func(Object *ob, int tmode)
 {
        IpoCurve *icu;
-       char *actname="";
        
-       if (autokeyframe_cfra_can_key(ob)) {            
+       if (autokeyframe_cfra_can_key(ob)) {
+               char *actname = NULL;
+               
                if (ob->ipoflag & OB_ACTION_OB)
                        actname= "Object";
                
@@ -3260,14 +3261,14 @@
                        }
                }
                else {
-                       insertkey(&ob->id, ID_OB, actname, NULL, OB_ROT_X, 0);
-                       insertkey(&ob->id, ID_OB, actname, NULL, OB_ROT_Y, 0);
-                       insertkey(&ob->id, ID_OB, actname, NULL, OB_ROT_Z, 0);
-                       
                        insertkey(&ob->id, ID_OB, actname, NULL, OB_LOC_X, 0);
                        insertkey(&ob->id, ID_OB, actname, NULL, OB_LOC_Y, 0);
                        insertkey(&ob->id, ID_OB, actname, NULL, OB_LOC_Z, 0);
                        
+                       insertkey(&ob->id, ID_OB, actname, NULL, OB_ROT_X, 0);
+                       insertkey(&ob->id, ID_OB, actname, NULL, OB_ROT_Y, 0);
+                       insertkey(&ob->id, ID_OB, actname, NULL, OB_ROT_Z, 0);
+                                               
                        insertkey(&ob->id, ID_OB, actname, NULL, OB_SIZE_X, 0);
                        insertkey(&ob->id, ID_OB, actname, NULL, OB_SIZE_Y, 0);
                        insertkey(&ob->id, ID_OB, actname, NULL, OB_SIZE_Z, 0);
@@ -3275,6 +3276,7 @@
                
                remake_object_ipos(ob);
                allqueue(REDRAWMARKER, 0);
+               allqueue(REDRAWOOPS, 0);
        }
 }
 
@@ -3307,7 +3309,7 @@
                                        bActionChannel *achan; 
                                        
                                        for (achan = act->chanbase.first; 
achan; achan=achan->next) {
-                                               if (achan->ipo && !strcmp 
(achan->name, pchan->name)) {
+                                               if ((achan->ipo) && 
!strcmp(achan->name, pchan->name)) {
                                                        for (icu = 
achan->ipo->curve.first; icu; icu=icu->next) {
                                                                /* only insert 
keyframe if needed? */
                                                                if 
(IS_AUTOKEY_FLAG(INSERTNEEDED))
@@ -3380,8 +3382,9 @@
                        }
                }
                
-               remake_action_ipos (act);
+               remake_action_ipos(act);
                allqueue(REDRAWMARKER, 0);
+               allqueue(REDRAWOOPS, 0);
                
                /* locking can be disabled */
                ob->pose->flag &= ~(POSE_DO_UNLOCK|POSE_LOCKED);


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs