[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10882] trunk/blender/source/blender/src: Bugfix #6809: K key in 3d viewport does not exit keyframe mode in Ipo Editor

[Joshua Leung]

Revision: 10882
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10882
Author:   aligorith
Date:     2007-06-06 06:13:02 +0200 (Wed, 06 Jun 2007)

Log Message:
-----------
Bugfix #6809: K key in 3d viewport does not exit keyframe mode in Ipo Editor

Patch by Juho Veps?\195?\164l?\195?\164inen (BeBraw) included with the report fixes this issue.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editipo_mods.c
    trunk/blender/source/blender/src/editobject.c

Modified: trunk/blender/source/blender/src/editipo_mods.c
===================================================================
--- trunk/blender/source/blender/src/editipo_mods.c	2007-06-05 19:39:19 UTC (rev 10881)
+++ trunk/blender/source/blender/src/editipo_mods.c	2007-06-06 04:13:02 UTC (rev 10882)
@@ -79,15 +79,13 @@
 
 void ipo_toggle_showkey(void) 
 {
-	if(G.sipo->showkey) {
-		G.sipo->showkey= 0;
-		swap_selectall_editipo();	/* sel all */
-	}
+	if(G.sipo->showkey) G.sipo->showkey= 0;
 	else G.sipo->showkey= 1;
+
 	free_ipokey(&G.sipo->ipokey);
 	if(G.sipo->ipo) G.sipo->ipo->showkey= G.sipo->showkey;
 	
-	BIF_undo_push("Toggle show key Ipo");
+	BIF_undo_push("Toggle Show Key Ipo");
 }
 
 void swap_selectall_editipo(void)

Modified: trunk/blender/source/blender/src/editobject.c
===================================================================
--- trunk/blender/source/blender/src/editobject.c	2007-06-05 19:39:19 UTC (rev 10881)
+++ trunk/blender/source/blender/src/editobject.c	2007-06-06 04:13:02 UTC (rev 10882)
@@ -5184,18 +5184,17 @@
 			}
 			else {
 				base->object->ipoflag &= ~OB_DRAWKEY;
+				if(base->object->ipo) base->object->ipo->showkey= 0;
 			}
 		}
 		base= base->next;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 	allqueue(REDRAWBUTSOBJECT, 0);
-	if(set) {
-		allqueue(REDRAWNLA, 0);
-		allqueue (REDRAWACTION, 0);
-		allspace(REMAKEIPO, 0);
-		allqueue(REDRAWIPO, 0);
-	}
+	allqueue(REDRAWNLA, 0);
+	allqueue (REDRAWACTION, 0);
+	allspace(REMAKEIPO, 0);
+	allqueue(REDRAWIPO, 0);
 }
 
 void select_select_keys(void)