Bugfix #4042

New empty drawsize and type are initialized on loading old files now.

1 files changed, 6 insertions, 5 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6427fc1ae61..f710651c38d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5296,6 +5296,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 	}
 	
 	if(main->versionfile <= 241) {
+		Object *ob;
 		Tex *tex;
 		Scene *sce;
 		Lamp *la;
@@ -5367,15 +5368,15 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				tex->env->viewscale= 1.0f;
 //			tex->imaflag |= TEX_GAUSS_MIP;
 		}
-		//Object *ob;
 		
 		/* for empty drawsize and drawtype */
-		/* uncomment before release!  --broken
 		for(ob=main->object.first; ob; ob= ob->id.next) {
-			ob->empty_drawtype = OB_ARROWS;
-			ob->empty_drawsize = 1.0;
+			if(ob->empty_drawsize==0.0f) {
+				ob->empty_drawtype = OB_ARROWS;
+				ob->empty_drawsize = 1.0;
+			}
 		}
-		*/
+		
 	}