Changed order in evaluation for common_instertkey menu, to enable posemode

key insterting working on unselected armature.

2 files changed, 15 insertions, 13 deletions

diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c
index a561dde689a..eb924f0b812 100644
--- a/source/blender/src/editipo.c
+++ b/source/blender/src/editipo.c
@@ -3805,18 +3805,19 @@ void common_insertkey()
 	else if(curarea->spacetype==SPACE_VIEW3D) {
 		
 
-		base= FIRSTBASE;
-		while(base) {
-			if TESTBASELIB(base) break;
-			base= base->next;
+		if (G.obpose) {
+			strcpy(menustr, "Insert Key%t|Loc%x0|Rot%x1|Size%x2|LocRot%x3|LocRotSize%x4|Avail%x9");
 		}
-		if(base==0) return;
+		else {
+			base= FIRSTBASE;
+			while(base) {
+				if TESTBASELIB(base) break;
+				base= base->next;
+			}
+			if(base==0) return;
 		
-		if (G.obpose)
-			strcpy(menustr, "Insert Key%t|Loc%x0|Rot%x1|Size%x2|LocRot%x3|LocRotSize%x4|Avail%x9");
-		else
 			strcpy(menustr, "Insert Key%t|Loc%x0|Rot%x1|Size%x2|LocRot%x3|LocRotSize%x4|Layer%x5|Avail%x9");
-
+		}
 		
 		if( (ob = OBACT)) {
 			if(ob->type==OB_MESH) strcat(menustr, "| %x6|Mesh%x7");
diff --git a/source/blender/src/editoops.c b/source/blender/src/editoops.c
index 30a01e676d9..d306236d319 100644
--- a/source/blender/src/editoops.c
+++ b/source/blender/src/editoops.c
@@ -149,7 +149,7 @@ void swap_select_all_oops(void)
 	
 	oops_to_select_objects();	/* also redraw */
 	
-	G.soops->lockpoin= 0;
+	G.soops->lockpoin= NULL;
 }
 
 /* never used... check CVS 1.12 for the code */
@@ -168,7 +168,7 @@ static void deselect_all_oops(void)
 		}
 		oops= oops->next;
 	}
-	G.soops->lockpoin= 0;
+	G.soops->lockpoin= NULL;
 }
 
 void set_select_flag_oops(void)	/* all areas */
@@ -184,7 +184,7 @@ void set_select_flag_oops(void)	/* all areas */
 		}
 		sa= sa->next;
 	}
-	if(G.soops) G.soops->lockpoin= 0;
+	if(G.soops) G.soops->lockpoin= NULL;
 }
 
 void deselect_all_area_oops(void)	/* all areas */
@@ -207,7 +207,7 @@ void deselect_all_area_oops(void)	/* all areas */
 		sa= sa->next;
 	}
 	
-	if(G.soops) G.soops->lockpoin= 0;
+	if(G.soops) G.soops->lockpoin= NULL;
 }
 
 void transform_oops(int mode)
@@ -412,6 +412,7 @@ static void do_activate_oops(Oops *oops)
 		if(base) {
 			set_active_base(base);	/* editview.c */
 			allqueue(REDRAWVIEW3D, 0);
+			allqueue(REDRAWOOPS, 0);
 			allqueue(REDRAWINFO, 1);
 		}
 		break;