[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32963] trunk/blender/source/blender: remove unused scene members 'jumpframe' and 'ima'

Campbell Barton ideasman42 at gmail.com
Tue Nov 9 11:40:03 CET 2010


Revision: 32963
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32963
Author:   campbellbarton
Date:     2010-11-09 11:40:03 +0100 (Tue, 09 Nov 2010)

Log Message:
-----------
remove unused scene members 'jumpframe' and 'ima'

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesdna/DNA_scene_types.h

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2010-11-09 09:53:17 UTC (rev 32962)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2010-11-09 10:40:03 UTC (rev 32963)
@@ -128,7 +128,6 @@
 		
 		id_us_plus((ID *)scen->world);
 		id_us_plus((ID *)scen->set);
-		id_us_plus((ID *)scen->ima);
 		id_us_plus((ID *)scen->gm.dome.warptext);
 
 		scen->ed= NULL;
@@ -444,8 +443,7 @@
 		pset->brush[a].count= 10;
 	}
 	pset->brush[PE_BRUSH_CUT].strength= 100;
-	
-	sce->jumpframe = 10;
+
 	sce->r.ffcodecdata.audio_mixrate = 44100;
 
 	sce->audio.distance_model = 2.0;

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-11-09 09:53:17 UTC (rev 32962)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-11-09 10:40:03 UTC (rev 32963)
@@ -4158,7 +4158,6 @@
 			sce->camera= newlibadr(fd, sce->id.lib, sce->camera);
 			sce->world= newlibadr_us(fd, sce->id.lib, sce->world);
 			sce->set= newlibadr(fd, sce->id.lib, sce->set);
-			sce->ima= newlibadr_us(fd, sce->id.lib, sce->ima);
 			sce->gpd= newlibadr_us(fd, sce->id.lib, sce->gpd);
 			
 			link_paint(fd, sce, &sce->toolsettings->sculpt->paint);
@@ -8166,7 +8165,6 @@
 			if(arm->layer==0) arm->layer= 1;
 		}
 		for(sce= main->scene.first; sce; sce= sce->id.next) {
-			if(sce->jumpframe==0) sce->jumpframe= 10;
 			if(sce->audio.mixrate==0) sce->audio.mixrate= 44100;
 
 			if(sce->r.xparts<2) sce->r.xparts= 4;

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2010-11-09 09:53:17 UTC (rev 32962)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2010-11-09 10:40:03 UTC (rev 32963)
@@ -760,7 +760,6 @@
 	struct World *world;
 	
 	struct Scene *set;
-	struct Image *ima;
 	
 	ListBase base;
 	struct Base *basact;		/* active base */
@@ -804,7 +803,7 @@
 	short dagisvalid, dagflags;
 	short recalc;				/* recalc = counterpart of ob->recalc */
 
-	short jumpframe;
+	short pad6;
 	int pad5;
 
 	/* User-Defined KeyingSets */





More information about the Bf-blender-cvs mailing list