From d0da285547071aa51291ef3a07ec41d1fd4b0ac1 Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
Date: Mon, 26 Jul 2004 22:46:56 +0000
Subject: [PATCH] Fixed small annoyonce that was there for long; New objects
 were not created with correct 'ipowin' value, to denote the default ipo to
 show. That caused sometimes wrong display with weird empty menu button in
 header.

---
 source/blender/blenkernel/intern/object.c   | 2 +-
 source/blender/blenloader/intern/readfile.c | 7 +++++++
 source/blender/src/space.c                  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 0a4d5c8662a..99a7c577b12 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -647,7 +647,7 @@ Object *add_object(int type)
 		ob->upflag= OB_POSZ;
 	}
 	ob->ipoflag = OB_OFFS_OB+OB_OFFS_PARENT;
-	
+	ob->ipowin= ID_OB;	/* the ipowin shown */
 	ob->dupon= 1; ob->dupoff= 0;
 	ob->dupsta= 1; ob->dupend= 100;
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d100e35f42f..8123aa22d42 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4236,6 +4236,7 @@ static void do_versions(Main *main)
 	}
 	if(main->versionfile <= 233) {
 		Material *ma= main->mat.first;
+		Object *ob= main->object.first;
 		
 		while(ma) {
 			if(ma->rampfac_col==0.0) ma->rampfac_col= 1.0;
@@ -4243,6 +4244,12 @@ static void do_versions(Main *main)
 			if(ma->pr_lamp==0) ma->pr_lamp= 3;
 			ma= ma->id.next;
 		}
+		
+		/* this should have been done loooong before! */
+		while(ob) {
+			if(ob->ipowin==0) ob->ipowin= ID_OB;
+			ob= ob->id.next;
+		}
 	}
 	
 	/* don't forget to set version number in blender.c! */
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 6944de43c8b..e2b0470be0f 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -4130,7 +4130,7 @@ void allqueue(unsigned short event, short val)
 					scrarea_queue_headredraw(sa);
 					if(val) {
 						si= sa->spacedata.first;
-						if (!G.sipo->pin)							
+						if (si->pin==0)							
 							si->blocktype= val;
 					}
 				}