From fb27561c494b04dc981936c2e49cc2d6d69c64d9 Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
Date: Tue, 2 Nov 2004 15:58:36 +0000
Subject: Potential fix #2 for error in 'flashing UI' while adding Bones. Also
 added redraw events for object buttons, to show constraints when selecting
 bones

---
 source/blender/src/editarmature.c | 9 +++++++--
 source/blender/src/space.c        | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index 552abbfcf7e..6448e9642f1 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -424,6 +424,7 @@ void selectconnected_armature(void)
 	countall();
 	allqueue (REDRAWVIEW3D, 0);
 	allqueue (REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
 	allqueue(REDRAWOOPS, 0);
 
 }
@@ -462,6 +463,7 @@ void selectconnected_posearmature(void)
 	countall();
 	allqueue (REDRAWVIEW3D, 0);
 	allqueue(REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
 	allqueue (REDRAWACTION, 0);
 	allqueue(REDRAWOOPS, 0);
 }
@@ -698,7 +700,7 @@ void delete_armature(void)
 	
 	allqueue(REDRAWVIEW3D, 0);
 	allqueue(REDRAWBUTSEDIT, 0);
-	allqueue(REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
 	allqueue(REDRAWOOPS, 0);
 	countall();
 }
@@ -731,6 +733,7 @@ static void delete_bone(EditBone* exBone)
 
 	allqueue(REDRAWBUTSOBJECT, 0);
 	allqueue(REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
 	allqueue(REDRAWOOPS, 0);
 
 	BLI_freelinkN (&G.edbo,exBone);
@@ -745,6 +748,7 @@ void remake_editArmature(void)
 	allqueue(REDRAWOOPS, 0);
 	allqueue(REDRAWBUTSHEAD, 0);
 	allqueue(REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
 }
 
 void mouse_armature(void)
@@ -1776,7 +1780,6 @@ void deselectall_armature(void)
 	};
 	allqueue(REDRAWVIEW3D, 0);
 	allqueue(REDRAWBUTSEDIT, 0);
-	allqueue(REDRAWBUTSHEAD, 0);
 	allqueue(REDRAWBUTSOBJECT, 0);
 	allqueue(REDRAWOOPS, 0);
 	countall();
@@ -2236,6 +2239,7 @@ void mousepose_armature(void)
 	allqueue(REDRAWACTION, 0);
 	allqueue(REDRAWIPO, 0);		/* To force action ipo update */
 	allqueue(REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
 	allqueue(REDRAWOOPS, 0);
 
 	rightmouse_transform();
@@ -2461,6 +2465,7 @@ void deselectall_posearmature (int test){
 		deselect_bonechildren (ob, curBone, selectmode);
 	
 	allqueue(REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
 	allqueue(REDRAWVIEW3D, 0);
 	allqueue(REDRAWOOPS, 0);
 	allqueue(REDRAWACTION, 0);
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index f5af535c356..f014942aca8 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -4638,6 +4638,7 @@ void force_draw_plus(int type)
 	ScrArea *tempsa, *sa;
 
 	scrarea_do_windraw(curarea); 
+	scrarea_do_headdraw(curarea);
 
 	tempsa= curarea;
 	sa= G.curscreen->areabase.first;
@@ -4646,6 +4647,7 @@ void force_draw_plus(int type)
 			if(ELEM5(sa->spacetype, SPACE_VIEW3D, SPACE_IPO, SPACE_SEQ, SPACE_BUTS, SPACE_ACTION)) {
 				areawinset(sa->win);
 				scrarea_do_windraw(sa);
+				scrarea_do_headdraw(sa);
 			}
 		}
 		sa= sa->next;
-- 
cgit v1.2.3