Revision: 36739
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36739
Author:   campbellbarton
Date:     2011-05-18 08:16:33 +0000 (Wed, 18 May 2011)
Log Message:
-----------
2 minor glitches
- removing bone groups didnt set the next one active.
- removing poselib was using int for enum rna property.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/action.c
    trunk/blender/source/blender/editors/armature/poselib.c

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c     2011-05-18 
07:46:54 UTC (rev 36738)
+++ trunk/blender/source/blender/blenkernel/intern/action.c     2011-05-18 
08:16:33 UTC (rev 36739)
@@ -831,7 +831,10 @@
                
                /* now, remove it from the pose */
                BLI_freelinkN(&pose->agroups, grp);
-               pose->active_group= 0;
+               pose->active_group--;
+               if(pose->active_group < 0 || pose->agroups.first == NULL) {
+                       pose->active_group= 0;
+               }
        }
 }
 

Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c     2011-05-18 
07:46:54 UTC (rev 36738)
+++ trunk/blender/source/blender/editors/armature/poselib.c     2011-05-18 
08:16:33 UTC (rev 36739)
@@ -527,7 +527,7 @@
        }
        
        /* get index (and pointer) of pose to remove */
-       marker= BLI_findlink(&act->markers, RNA_int_get(op->ptr, "pose"));
+       marker= BLI_findlink(&act->markers, RNA_enum_get(op->ptr, "pose"));
        if (marker == NULL) {
                BKE_reportf(op->reports, RPT_ERROR, "Invalid Pose specified 
%d", RNA_int_get(op->ptr, "pose"));
                return OPERATOR_CANCELLED;

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

Reply via email to