diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
commit | 40449b1994301081f96d014df626a5375e020c76 (patch) | |
tree | 20220d8b071310fda8a0ab851c7a8f7bcc3ed8a2 /source/blender/blenloader | |
parent | fa0211df269a3398dd70467982f9e129c79e501b (diff) | |
parent | 3ca00cbf541d0283e91dc454866a5f24576271be (diff) |
Merged changes in the trunk up to revision 53280.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/BLO_soundfile.h | 41 | ||||
-rw-r--r-- | source/blender/blenloader/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 19 |
3 files changed, 13 insertions, 48 deletions
diff --git a/source/blender/blenloader/BLO_soundfile.h b/source/blender/blenloader/BLO_soundfile.h deleted file mode 100644 index d2f87139b74..00000000000 --- a/source/blender/blenloader/BLO_soundfile.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ -#ifndef __BLO_SOUNDFILE_H__ -#define __BLO_SOUNDFILE_H__ - -/** \file BLO_soundfile.h - * \ingroup blenloader - */ - -#include "DNA_sound_types.h" -#include "DNA_packedFile_types.h" - -struct bSound; -struct PackedFile; - -#endif - diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 894cd24fc4a..b55d6b679d2 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -52,7 +52,6 @@ set(SRC BLO_blend_defs.h BLO_readfile.h BLO_runtime.h - BLO_soundfile.h BLO_sys_types.h BLO_undofile.h BLO_writefile.h diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 453f35d8057..a1440386e99 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6824,9 +6824,16 @@ static BHead *read_global(BlendFileData *bfd, FileData *fd, BHead *bhead) bfd->globalf = fg->globalf; BLI_strncpy(bfd->filename, fg->filename, sizeof(bfd->filename)); - /* early 2.50 version patch - filename not in FileGlobal struct */ - if (fd->fileversion <= 250) - BLI_strncpy(bfd->filename, bfd->main->name, sizeof(bfd->main->name)); + /* error in 2.65 and older: main->name was not set if you save from startup (not after loading file) */ + if (bfd->filename[0] == 0) { + if (fd->fileversion < 265 || (fd->fileversion == 265 && fg->subversion < 1)) + if ((G.fileflags & G_FILE_RECOVER)==0) + BLI_strncpy(bfd->filename, bfd->main->name, sizeof(bfd->filename)); + + /* early 2.50 version patch - filename not in FileGlobal struct at all */ + if (fd->fileversion <= 250) + BLI_strncpy(bfd->filename, bfd->main->name, sizeof(bfd->filename)); + } if (G.fileflags & G_FILE_RECOVER) BLI_strncpy(fd->relabase, fg->filename, sizeof(fd->relabase)); @@ -8087,7 +8094,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if (md->type == eModifierType_Smoke) { SmokeModifierData *smd = (SmokeModifierData *)md; if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { - int maxres = MAX3(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2]); + int maxres = max_iii(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2]); smd->domain->scale = smd->domain->dx * maxres; smd->domain->dx = 1.0f / smd->domain->scale; } @@ -8633,8 +8640,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main) Scene *scene; for (scene = main->scene.first; scene; scene = scene->id.next) { - if (scene->r.bake_rays_number == 0) - scene->r.bake_rays_number = 256; + if (scene->r.bake_samples == 0) + scene->r.bake_samples = 256; } } |