blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: remove unused Image space curves 

Caused leaks reading old files, was read/written but not freed,
remove since its unused.
This commit is contained in:
Campbell Barton 2016-06-22 09:50:53 +10:00
parent e0f314d750
commit 435fa9a015
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenloader/intern/readfile.c
View File

@ -7038,11 +7038,7 @@ static bool direct_link_screen(FileData *fd, bScreen *sc)
}
else if (sl->spacetype == SPACE_IMAGE) {
SpaceImage *sima = (SpaceImage *)sl;
sima->cumap = newdataadr(fd, sima->cumap);
if (sima->cumap)
direct_link_curvemapping(fd, sima->cumap);
sima->iuser.scene = NULL;
sima->iuser.ok = 1;
sima->scopes.waveform_1 = NULL;

4
source/blender/blenloader/intern/writefile.c
View File

@ -2808,11 +2808,7 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
write_soops(wd, so, &tmp_mem_list);
}
else if (sl->spacetype==SPACE_IMAGE) {
SpaceImage *sima= (SpaceImage *)sl;
writestruct(wd, DATA, "SpaceImage", 1, sl);
if (sima->cumap)
write_curvemapping(wd, sima->cumap);
}
else if (sl->spacetype==SPACE_TEXT) {
writestruct(wd, DATA, "SpaceText", 1, sl);

2
source/blender/makesdna/DNA_space_types.h
View File

@ -875,8 +875,6 @@ typedef struct SpaceImage {
struct Image *image;
struct ImageUser iuser;
struct CurveMapping *cumap DNA_DEPRECATED; /* was switched to scene's color management settings */
struct Scopes scopes; /* histogram waveform and vectorscope */
struct Histogram sample_line_hist; /* sample line histogram */