[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28028] trunk/blender/source/blender/ blenloader/intern/readfile.c: Missed this in last commit

[Matt Ebb]

Revision: 28028
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28028
Author:   broken
Date:     2010-04-06 04:09:21 +0200 (Tue, 06 Apr 2010)

Log Message:
-----------
Missed this in last commit

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-04-06 02:05:54 UTC (rev 28027)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-04-06 02:09:21 UTC (rev 28028)
@@ -4836,6 +4836,9 @@
 					SpaceImage *sima= (SpaceImage *)sl;
 
 					sima->image= restore_pointer_by_name(newmain, (ID *)sima->image, 1);
+
+					sima->scopes.samples_ibuf = NULL;
+					sima->scopes.ok = 0;
 					
 					/* NOTE: pre-2.5, this was local data not lib data, but now we need this as lib data
 					 * so assume that here we're doing for undo only...
@@ -5108,6 +5111,8 @@
 				
 				sima->iuser.scene= NULL;
 				sima->iuser.ok= 1;
+				sima->scopes.samples_ibuf = NULL;
+				sima->scopes.ok = 0;
 				
 				/* WARNING: gpencil data is no longer stored directly in sima after 2.5 
 				 * so sacrifice a few old files for now to avoid crashes with new files!
@@ -10731,7 +10736,26 @@
 	
 	/* put 2.50 compatibility code here until next subversion bump */
 	{
+		bScreen *sc;
 		
+		/* Image editor scopes */
+		for(sc= main->screen.first; sc; sc= sc->id.next) {
+			ScrArea *sa;
+			for(sa= sc->areabase.first; sa; sa= sa->next) {
+				SpaceLink *sl;
+				for (sl= sa->spacedata.first; sl; sl= sl->next) {
+					if(sl->spacetype==SPACE_IMAGE) {
+						SpaceImage *sima = (SpaceImage *)sl;
+						sima->scopes.accuracy = 30.0;
+						sima->scopes.hist.mode=HISTO_MODE_RGB;
+						sima->scopes.wavefrm_alpha=0.3;
+						sima->scopes.vecscope_alpha=0.3;
+						sima->scopes.wavefrm_height= 100;
+						sima->scopes.hist.height= 100;
+					}
+				}
+			}
+		}
 	}
 
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */