A few tweaks to the old->new camera conversion code

after chatting with Ton. I've commented out the old file
title safe conversion for now, so we can actually use it in
files worked on now. Have noted to remember to
uncomment it before the new version number bump.

1 files changed, 9 insertions, 2 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 66b1ba43915..9e9c5d15843 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5021,12 +5021,19 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		while(sce) {
 			while(cam) {
 				/* convert the passepartout scene flag to a camera flag */
-				if(sce->r.scemode & R_PASSEPARTOUT)
+				if(sce->r.scemode & R_PASSEPARTOUT) {
 					cam->flag |= CAM_SHOWPASSEPARTOUT;
+					/* now disable it from the scene*/
+					sce->r.scemode &= ~R_PASSEPARTOUT;
+				}
 				
 				/* make sure old cameras have title safe on */
-				if (!(cam->flag & CAM_SHOWTITLESAFE))
+				
+				/* *** to be uncommented before 2.40 release! *** */
+				/* 
+					if (!(cam->flag & CAM_SHOWTITLESAFE))
 					cam->flag |= CAM_SHOWTITLESAFE;
+				*/
 				cam= cam->id.next;
 			}
 			sce= sce->id.next;