bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

remove unused scene members 'jumpframe' and 'ima'

Browse Source
This commit is contained in:
Campbell Barton 2010-11-09 10:40:03 +00:00
parent 7a62c05204
commit db4c2b8016
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/scene.c
View File

@ -128,7 +128,6 @@ Scene *copy_scene(Scene *sce, int type)
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 @@ Scene *add_scene(char *name)
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;

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

@ -4158,7 +4158,6 @@ static void lib_link_scene(FileData *fd, Main *main)
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 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
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;

3
source/blender/makesdna/DNA_scene_types.h
View File

@ -760,7 +760,6 @@ typedef struct Scene {
struct World *world;
struct Scene *set;
struct Image *ima;
ListBase base;
struct Base *basact; /* active base */
@ -804,7 +803,7 @@ typedef struct Scene {
short dagisvalid, dagflags;
short recalc; /* recalc = counterpart of ob->recalc */
short jumpframe;
short pad6;
int pad5;
/* User-Defined KeyingSets */