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.
92 lines
2.7 KiB
C++
92 lines
2.7 KiB
C++
/**
|
|
* blenlib/BKE_scene.h (mar-2001 nzc)
|
|
*
|
|
* $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_SCENE_H
|
|
#define BKE_SCENE_H
|
|
|
|
struct bglMats;
|
|
struct Scene;
|
|
struct Object;
|
|
struct Base;
|
|
struct AviCodecData;
|
|
struct QuicktimeCodecData;
|
|
struct SculptData;
|
|
struct RenderData;
|
|
|
|
/* sequence related defines */
|
|
|
|
#define WHILE_SEQ(base) { \
|
|
int totseq_, seq_; Sequence **seqar; \
|
|
build_seqar( base, &seqar, &totseq_); \
|
|
for(seq_ = 0; seq_ < totseq_; seq_++) { \
|
|
seq= seqar[seq_];
|
|
|
|
|
|
#define END_SEQ } \
|
|
if(seqar) MEM_freeN(seqar); \
|
|
}
|
|
|
|
/* note; doesn't work when scene is empty */
|
|
#define SETLOOPER(s, b) sce= s, b= (Base*)sce->base.first; b; b= (Base*)(b->next?b->next:sce->set?(sce=sce->set)->base.first:NULL)
|
|
|
|
|
|
void free_avicodecdata(struct AviCodecData *acd);
|
|
void free_qtcodecdata(struct QuicktimeCodecData *acd);
|
|
|
|
void free_scene(struct Scene *me);
|
|
struct Scene *add_scene(char *name);
|
|
struct Base *object_in_scene(struct Object *ob, struct Scene *sce);
|
|
|
|
void set_scene_bg(struct Scene *sce);
|
|
void set_scene_name(char *name);
|
|
|
|
int next_object(int val, struct Base **base, struct Object **ob);
|
|
struct Object *scene_find_camera(struct Scene *sc);
|
|
|
|
struct Base *scene_add_base(struct Scene *sce, struct Object *ob);
|
|
void scene_deselect_all(struct Scene *sce);
|
|
void scene_select_base(struct Scene *sce, struct Base *selbase);
|
|
|
|
/* checks for cycle, returns 1 if it's all OK */
|
|
int scene_check_setscene(struct Scene *sce);
|
|
|
|
void scene_update_for_newframe(struct Scene *sce, unsigned int lay);
|
|
|
|
void scene_add_render_layer(struct Scene *sce);
|
|
|
|
/* render profile */
|
|
int get_render_subsurf_level(struct RenderData *r, int level);
|
|
int get_render_child_particle_number(struct RenderData *r, int num);
|
|
int get_render_shadow_samples(struct RenderData *r, int samples);
|
|
float get_render_aosss_error(struct RenderData *r, float error);
|
|
|
|
#endif
|
|
|