[Bf-blender-cvs] [435fa9a] master: Cleanup: remove unused Image space curves

Campbell Barton noreply at git.blender.org
Wed Jun 22 04:15:14 CEST 2016


Commit: 435fa9a015c8e1396ff2b7f72e2b83f1b8867790
Author: Campbell Barton
Date:   Wed Jun 22 09:50:53 2016 +1000
Branches: master
https://developer.blender.org/rB435fa9a015c8e1396ff2b7f72e2b83f1b8867790

Cleanup: remove unused Image space curves

Caused leaks reading old files, was read/written but not freed,
remove since its unused.

===================================================================

M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/writefile.c
M	source/blender/makesdna/DNA_space_types.h

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 689a975..fd611da 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -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;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index b5a2115..a7cb104 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -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);
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 46b7d71..9c177cd 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -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 */




More information about the Bf-blender-cvs mailing list