diff options
| author | Matt Ebb <matt@mke3.net> | 2010-04-09 04:44:35 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-04-09 04:44:35 +0400 |
| commit | 77833847eee49b1810d650d3c94ebfbdb96602be (patch) | |
| tree | b5407f3b6a4803add77544d94f50c484cc69d40e /source/blender/blenloader | |
| parent | c1a9d4d7a35e59428bc51e2b4c45e19a3a9758ec (diff) | |
Patch from Xavier Thomas: Use vertex arrays for drawing image editor vector scope
too, making it a lot more efficient.
Also fixed issue with scopes height not being stored in file properly.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 689faac505a..3196de4243c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4834,10 +4834,10 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene) sima->image= restore_pointer_by_name(newmain, (ID *)sima->image, 1); - sima->scopes.samples_ibuf = NULL; sima->scopes.waveform_1 = NULL; sima->scopes.waveform_2 = NULL; sima->scopes.waveform_3 = NULL; + sima->scopes.vecscope = NULL; sima->scopes.ok = 0; /* NOTE: pre-2.5, this was local data not lib data, but now we need this as lib data @@ -5111,10 +5111,10 @@ static void direct_link_screen(FileData *fd, bScreen *sc) sima->iuser.scene= NULL; sima->iuser.ok= 1; - sima->scopes.samples_ibuf = NULL; sima->scopes.waveform_1 = NULL; sima->scopes.waveform_2 = NULL; sima->scopes.waveform_3 = NULL; + sima->scopes.vecscope = NULL; sima->scopes.ok = 0; /* WARNING: gpencil data is no longer stored directly in sima after 2.5 @@ -10737,8 +10737,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) do_version_old_trackto_to_constraints(ob); } - /* put 2.50 compatibility code here until next subversion bump */ - { + if (main->versionfile < 252 || (main->versionfile == 252 && main->subversionfile < 5)) { bScreen *sc; /* Image editor scopes */ @@ -10754,12 +10753,18 @@ static void do_versions(FileData *fd, Library *lib, Main *main) sima->scopes.wavefrm_alpha=0.3; sima->scopes.vecscope_alpha=0.3; sima->scopes.wavefrm_height= 100; + sima->scopes.vecscope_height= 100; sima->scopes.hist.height= 100; } } } } } + + /* put 2.50 compatibility code here until next subversion bump */ + { + + } /* WATCH IT!!!: pointers from libdata have not been converted yet here! */ /* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */ |