[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43395] trunk/blender/source/blender: remove some unused DNA members

Campbell Barton ideasman42 at gmail.com
Sun Jan 15 12:53:22 CET 2012


Revision: 43395
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43395
Author:   campbellbarton
Date:     2012-01-15 11:53:14 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
remove some unused DNA members

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/space_buttons/space_buttons.c
    trunk/blender/source/blender/makesdna/DNA_meta_types.h
    trunk/blender/source/blender/makesdna/DNA_space_types.h

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-01-15 10:48:39 UTC (rev 43394)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-01-15 11:53:14 UTC (rev 43395)
@@ -5160,7 +5160,6 @@
 					}
 					else if(sl->spacetype==SPACE_BUTS) {
 						SpaceButs *sbuts= (SpaceButs *)sl;
-						sbuts->ri= NULL;
 						sbuts->pinid= newlibadr(fd, sc->id.lib, sbuts->pinid);
 						sbuts->mainbo= sbuts->mainb;
 						sbuts->mainbuser= sbuts->mainb;

Modified: trunk/blender/source/blender/editors/space_buttons/space_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2012-01-15 10:48:39 UTC (rev 43394)
+++ trunk/blender/source/blender/editors/space_buttons/space_buttons.c	2012-01-15 11:53:14 UTC (rev 43395)
@@ -96,11 +96,6 @@
 static void buttons_free(SpaceLink *sl)
 {	
 	SpaceButs *sbuts= (SpaceButs*) sl;
-	
-	if(sbuts->ri) { 
-		if (sbuts->ri->rect) MEM_freeN(sbuts->ri->rect);
-		MEM_freeN(sbuts->ri);
-	}
 
 	if(sbuts->path)
 		MEM_freeN(sbuts->path);
@@ -131,7 +126,6 @@
 	SpaceButs *sbutsn= MEM_dupallocN(sl);
 	
 	/* clear or remove stuff from old */
-	sbutsn->ri= NULL;
 	sbutsn->path= NULL;
 	sbutsn->texuser= NULL;
 	

Modified: trunk/blender/source/blender/makesdna/DNA_meta_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_meta_types.h	2012-01-15 10:48:39 UTC (rev 43394)
+++ trunk/blender/source/blender/makesdna/DNA_meta_types.h	2012-01-15 11:53:14 UTC (rev 43395)
@@ -45,7 +45,6 @@
 	struct MetaElem *next, *prev;
 
 	struct BoundBox *bb;        /* Bound Box of MetaElem */
-	int i1,j1,k1, i2,j2,k2;     /* corners of Bounding Box in lattice */
 
 	short type, flag, selcol1, selcol2;
 	float x, y, z;          /* Position of center of MetaElem */

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2012-01-15 10:48:39 UTC (rev 43394)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2012-01-15 11:53:14 UTC (rev 43395)
@@ -133,8 +133,6 @@
 	float blockscale  DNA_DEPRECATED;
 	
 	short blockhandler[8]  DNA_DEPRECATED;
-	
-	struct RenderInfo *ri;
 
 	View2D v2d  DNA_DEPRECATED;						/* deprecated, copied to region */
 	



More information about the Bf-blender-cvs mailing list