griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r47413:47423

Browse Source
This commit is contained in:
Campbell Barton
2012-06-04 16:56:51 +00:00
parent 0d50a364ed 68a9dd54ec
commit 2202aaa083
4 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1210,7 +1210,6 @@ static void change_idid_adr_fd(FileData *fd, void *old, void *new)
if (old==entry->newp && entry->nr==ID_ID) {
entry->newp = new;
if (new) entry->nr = GS( ((ID *)new)->name );
break;
}
}
}
@@ -7593,9 +7592,36 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 8))
{
/* set new deactivation values for game settings */
Scene *sce;
for (sce = main->scene.first; sce; sce = sce->id.next) {
/* Game Settings */
sce->gm.lineardeactthreshold = 0.8f;
sce->gm.angulardeactthreshold = 1.0f;
sce->gm.deactivationtime = 2.0f;
}
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
{
Scene *scene;
// composite redesign
for (scene=main->scene.first; scene; scene=scene->id.next) {
if (scene->nodetree) {
if (scene->nodetree->chunksize == 0) {
scene->nodetree->chunksize = 256;
}
}
}
}
{
MovieClip *clip;
bScreen *sc;
for (clip = main->movieclip.first; clip; clip = clip->id.next) {
MovieTrackingTrack *track;
@@ -7632,6 +7658,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
track = track->next;
}
}
}
{
bScreen *sc;
for (sc = main->screen.first; sc; sc = sc->id.next) {
ScrArea *sa;
@@ -7652,33 +7682,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 8))
{
/* set new deactivation values for game settings */
Scene *sce;
for (sce = main->scene.first; sce; sce = sce->id.next) {
/* Game Settings */
sce->gm.lineardeactthreshold = 0.8f;
sce->gm.angulardeactthreshold = 1.0f;
sce->gm.deactivationtime = 2.0f;
}
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
{
Scene *scene;
// composite redesign
for (scene=main->scene.first; scene; scene=scene->id.next) {
if (scene->nodetree) {
if (scene->nodetree->chunksize == 0) {
scene->nodetree->chunksize = 256;
}
}
}
}
/* don't forget to set version number in blender.c! */
}

5
source/blender/editors/render/render_internal.c
View File

@@ -288,11 +288,12 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str)
else if (scene->r.scemode & R_SINGLE_LAYER)
spos += sprintf(spos, "Single Layer | ");
spos += sprintf(spos, "Frame:%d ", (scene->r.cfra));
if (rs->statstr) {
spos += sprintf(spos, "%s ", rs->statstr);
spos += sprintf(spos, "| %s ", rs->statstr);
}
else {
spos += sprintf(spos, "Fra:%d ", (scene->r.cfra));
if (rs->totvert) spos += sprintf(spos, "Ve:%d ", rs->totvert);
if (rs->totface) spos += sprintf(spos, "Fa:%d ", rs->totface);
if (rs->tothalo) spos += sprintf(spos, "Ha:%d ", rs->tothalo);