[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60824] trunk/blender/source/blender/ editors: Compilation error fix for previous commit.

[Sergey Sharybin]

Revision: 60824
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60824
Author:   nazgul
Date:     2013-10-17 14:30:23 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Compilation error fix for previous commit.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_channels_edit.c
    trunk/blender/source/blender/editors/armature/pose_select.c

Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2013-10-17 14:19:03 UTC (rev 60823)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2013-10-17 14:30:23 UTC (rev 60824)
@@ -2450,10 +2450,10 @@
 			 * Since groups are used to collect F-Curves of the same Bone by default
 			 * (via Keying Sets) so that they can be managed better, we try to make
 			 * things here easier for animators by mapping group selection to bone
-			 * selection 
+			 * selection
 			 */
 			if ((ale->id) && (GS(ale->id->name) == ID_OB)) {
-				 ob = (ID *)ale->id;
+				ob = (Object *)ale->id;
 				
 				if (ob->type == OB_ARMATURE) {
 					/* Assume for now that any group with corresponding name is what we want
@@ -2487,7 +2487,7 @@
 			else {
 				/* select group by itself */
 				ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR);
-				if (pchan) ED_pose_deselctall(ob, 0);
+				if (pchan) ED_pose_deselectall(ob, 0);
 				
 				agrp->flag |= AGRP_SELECTED;
 			}

Modified: trunk/blender/source/blender/editors/armature/pose_select.c
===================================================================
--- trunk/blender/source/blender/editors/armature/pose_select.c	2013-10-17 14:19:03 UTC (rev 60823)
+++ trunk/blender/source/blender/editors/armature/pose_select.c	2013-10-17 14:30:23 UTC (rev 60824)
@@ -65,33 +65,34 @@
 /* ***************** Pose Select Utilities ********************* */
 
 /* Utility method for changing the selection status of a bone */
- void ED_pose_bone_select(Object *ob, bPoseChannel *pchan, bool select)
- {
- 	/* sanity checks */
- 	// XXX: actually, we can probably still get away with no object - at most we have no updates
- 	if (ELEM4(NULL, ob, ob->pose, pchan, pchan->bone))
- 		return;	
- 	
- 	/* can only change selection state if bone can be modified */	
- 	if (PBONE_SELECTABLE(ob, pchan->bone)) {
- 		bArmature *arm = ob->data;
- 		
- 		/* change selection state */
- 		if (select)
- 			pchan->bone->flag |= BONE_SELECTED;
- 		else
- 			pchan->bone->flag &= ~BONE_SELECTED;
- 		
- 		// TODO: select and activate corresponding vgroup?
- 		
- 		/* tag necessary depsgraph updates 
- 		 * (see rna_Bone_select_update() in rna_armature.c for details)
- 		 */
- 		if (arm->flag & ARM_HAS_VIZ_DEPS) {
+void ED_pose_bone_select(Object *ob, bPoseChannel *pchan, bool select)
+{
+	bArmature *arm;
+
+	/* sanity checks */
+	// XXX: actually, we can probably still get away with no object - at most we have no updates
+	if (ELEM4(NULL, ob, ob->pose, pchan, pchan->bone))
+		return;
+	
+	arm = ob->data;
+	/* can only change selection state if bone can be modified */
+	if (PBONE_SELECTABLE(arm, pchan->bone)) {
+		/* change selection state */
+		if (select)
+			pchan->bone->flag |= BONE_SELECTED;
+		else
+			pchan->bone->flag &= ~BONE_SELECTED;
+		
+		// TODO: select and activate corresponding vgroup?
+		
+		/* tag necessary depsgraph updates 
+		 * (see rna_Bone_select_update() in rna_armature.c for details)
+		 */
+		if (arm->flag & ARM_HAS_VIZ_DEPS) {
 			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 		}
- 	}
- }
+	}
+}
 
 /* called from editview.c, for mode-less pose selection */
 /* assumes scene obact and basact is still on old situation */