Brecht Van Lommel
bdfe7d89e2
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416 Issues: * GHOST/X11 had conflicting changes. Some code was added in 2.5, which was later added in trunk also, but reverted partially, specifically revision 16683. I have left out this reversion in the 2.5 branch since I think it is needed there. http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 * Scons had various conflicting changes, I decided to go with trunk version for everything except priorities and some library renaming. * In creator.c, there were various fixes and fixes for fixes related to the -w -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done differently. Since this is changed so much, and I don't think those fixes would be needed in 2.5, I've left them out. * Also in creator.c: there was code for a python bugfix where the screen was not initialized when running with -P. The code that initializes the screen there I had to disable, that can't work in 2.5 anymore but left it commented as a reminder. Further I had to disable some new function calls. using src/ and python/, as was done already in this branch, disabled function calls: * bpath.c: error reporting * BME_conversions.c: editmesh conversion functions. * SHD_dynamic: disabled almost completely, there is no python/. * KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled. * text.c: clipboard copy call. * object.c: OB_SUPPORT_MATERIAL. * DerivedMesh.c and subsurf_ccg, stipple_quarttone. Still to be done: * Go over files and functions that were moved to a different location but could still use changes that were done in trunk.
85 lines
2.0 KiB
C++
85 lines
2.0 KiB
C++
/**
|
|
* blenlib/BKE_main.h (mar-2001 nzc)
|
|
*
|
|
* Main is the root of the 'database' of a Blender context. All data
|
|
* is stuffed into lists, and all these lists are knotted to here. A
|
|
* Blender file is not much more but a binary dump of these
|
|
* lists. This list of lists is not serialized itself.
|
|
*
|
|
* Oops... this should be a _types.h file.
|
|
*
|
|
* $Id$
|
|
*
|
|
* ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 BKE_MAIN_H
|
|
#define BKE_MAIN_H
|
|
|
|
#include "DNA_listBase.h"
|
|
|
|
struct Library;
|
|
|
|
typedef struct Main {
|
|
struct Main *next, *prev;
|
|
char name[240];
|
|
short versionfile, subversionfile;
|
|
short minversionfile, minsubversionfile;
|
|
|
|
struct Library *curlib;
|
|
ListBase scene;
|
|
ListBase library;
|
|
ListBase object;
|
|
ListBase mesh;
|
|
ListBase curve;
|
|
ListBase mball;
|
|
ListBase mat;
|
|
ListBase tex;
|
|
ListBase image;
|
|
ListBase wave;
|
|
ListBase latt;
|
|
ListBase lamp;
|
|
ListBase camera;
|
|
ListBase ipo;
|
|
ListBase key;
|
|
ListBase world;
|
|
ListBase screen;
|
|
ListBase script;
|
|
ListBase vfont;
|
|
ListBase text;
|
|
ListBase sound;
|
|
ListBase group;
|
|
ListBase armature;
|
|
ListBase action;
|
|
ListBase nodetree;
|
|
ListBase brush;
|
|
ListBase particle;
|
|
ListBase wm;
|
|
} Main;
|
|
|
|
|
|
#endif
|
|
|