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

minor dna header cleanup

Browse Source
This commit is contained in:
Campbell Barton
2011-12-30 07:25:49 +00:00
parent 5c8c1a7358
commit ca629d5ccc
58 changed files with 240 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/makesdna/DNA_ID.h
View File

@@ -24,14 +24,15 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_ID_H
#define DNA_ID_H
/** \file DNA_ID.h
* \ingroup DNA
* \brief ID and Library types, which are fundamental for sdna.
*/
#ifndef DNA_ID_H
#define DNA_ID_H
#include "DNA_listBase.h"
#ifdef __cplusplus

10
source/blender/makesdna/DNA_action_types.h
View File

@@ -1,4 +1,4 @@
/*
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
@@ -29,7 +29,6 @@
* \ingroup DNA
*/
#ifndef DNA_ACTION_TYPES_H
#define DNA_ACTION_TYPES_H
@@ -204,7 +203,9 @@ typedef struct bPoseChannel {
bMotionPath *mpath; /* motion path cache for this bone */
struct Object *custom; /* draws custom object instead of default bone shape */
struct bPoseChannel *custom_tx; /* odd feature, display with another bones transform. needed in rare cases for advanced rigs, since the alternative is highly complicated - campbell */
struct bPoseChannel *custom_tx; /* odd feature, display with another bones transform.
* needed in rare cases for advanced rigs,
* since the alternative is highly complicated - campbell */
/* transforms - written in by actions or transform */
float loc[3];
@@ -219,7 +220,8 @@ typedef struct bPoseChannel {
float chan_mat[4][4]; /* matrix result of loc/quat/size , and where we put deform in, see next line */
float pose_mat[4][4]; /* constraints accumulate here. in the end, pose_mat = bone->arm_mat * chan_mat */
float constinv[4][4]; /* inverse result of constraints. doesn't include effect of restposition, parent, and local transform*/
float constinv[4][4]; /* inverse result of constraints.
* doesn't include effect of restposition, parent, and local transform*/
float pose_head[3]; /* actually pose_mat[3] */
float pose_tail[3]; /* also used for drawing help lines... */

6
source/blender/makesdna/DNA_anim_types.h
View File

@@ -23,13 +23,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_ANIM_TYPES_H
#define DNA_ANIM_TYPES_H
/** \file DNA_anim_types.h
* \ingroup DNA
*/
#ifndef DNA_ANIM_TYPES_H
#define DNA_ANIM_TYPES_H
#ifdef __cplusplus
extern "C" {
#endif

6
source/blender/makesdna/DNA_armature_types.h
View File

@@ -23,13 +23,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_ARMATURE_TYPES_H
#define DNA_ARMATURE_TYPES_H
/** \file DNA_armature_types.h
* \ingroup DNA
*/
#ifndef DNA_ARMATURE_TYPES_H
#define DNA_ARMATURE_TYPES_H
#include "DNA_listBase.h"
#include "DNA_ID.h"

6
source/blender/makesdna/DNA_boid_types.h
View File

@@ -26,13 +26,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_BOID_TYPES_H
#define DNA_BOID_TYPES_H
/** \file DNA_boid_types.h
* \ingroup DNA
*/
#ifndef DNA_BOID_TYPES_H
#define DNA_BOID_TYPES_H
#include "DNA_listBase.h"
typedef enum BoidRuleType {

6
source/blender/makesdna/DNA_brush_types.h
View File

@@ -25,13 +25,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_BRUSH_TYPES_H
#define DNA_BRUSH_TYPES_H
/** \file DNA_brush_types.h
* \ingroup DNA
*/
#ifndef DNA_BRUSH_TYPES_H
#define DNA_BRUSH_TYPES_H
#include "DNA_ID.h"
#include "DNA_texture_types.h" /* for MTex */

5
source/blender/makesdna/DNA_camera_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_CAMERA_TYPES_H
#define DNA_CAMERA_TYPES_H
/** \file DNA_camera_types.h
* \ingroup DNA
*/
#ifndef DNA_CAMERA_TYPES_H
#define DNA_CAMERA_TYPES_H
#include "DNA_defs.h"
#include "DNA_ID.h"

5
source/blender/makesdna/DNA_cloth_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_CLOTH_TYPES_H
#define DNA_CLOTH_TYPES_H
/** \file DNA_cloth_types.h
* \ingroup DNA
*/
#ifndef DNA_CLOTH_TYPES_H
#define DNA_CLOTH_TYPES_H
/**
* This struct contains all the global data required to run a simulation.
* At the time of this writing, this structure contains data appropriate

5
source/blender/makesdna/DNA_color_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
#ifndef DNA_COLOR_TYPES_H
#define DNA_COLOR_TYPES_H
/** \file DNA_color_types.h
* \ingroup DNA
*/
#ifndef DNA_COLOR_TYPES_H
#define DNA_COLOR_TYPES_H
#include "DNA_vec_types.h"
/* general defines for kernel functions */

11
source/blender/makesdna/DNA_constraint_types.h
View File

@@ -26,13 +26,13 @@
* Constraint DNA data
*/
#ifndef DNA_CONSTRAINT_TYPES_H
#define DNA_CONSTRAINT_TYPES_H
/** \file DNA_constraint_types.h
* \ingroup DNA
*/
#ifndef DNA_CONSTRAINT_TYPES_H
#define DNA_CONSTRAINT_TYPES_H
#include "DNA_defs.h"
#include "DNA_ID.h"
#include "DNA_listBase.h"
@@ -180,7 +180,10 @@ typedef struct bSplineIKConstraint {
/* Track To Constraint */
typedef struct bTrackToConstraint {
struct Object *tar;
int reserved1; /* I'll be using reserved1 and reserved2 as Track and Up flags, not sure if that's what they were intented for anyway. Not sure either if it would create backward incompatibility if I were to rename them. - theeth*/
int reserved1; /* I'll be using reserved1 and reserved2 as Track and Up flags,
* not sure if that's what they were intented for anyway.
* Not sure either if it would create backward incompatibility if I were to rename them.
* - theeth*/
int reserved2;
int flags;
int pad;

5
source/blender/makesdna/DNA_controller_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_CONTROLLER_TYPES_H
#define DNA_CONTROLLER_TYPES_H
/** \file DNA_controller_types.h
* \ingroup DNA
*/
#ifndef DNA_CONTROLLER_TYPES_H
#define DNA_CONTROLLER_TYPES_H
struct bActuator;
struct Text;
struct bSensor;

5
source/blender/makesdna/DNA_curve_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_CURVE_TYPES_H
#define DNA_CURVE_TYPES_H
/** \file DNA_curve_types.h
* \ingroup DNA
*/
#ifndef DNA_CURVE_TYPES_H
#define DNA_CURVE_TYPES_H
#include "DNA_defs.h"
#include "DNA_listBase.h"
#include "DNA_vec_types.h"

1
source/blender/makesdna/DNA_customdata_types.h
View File

@@ -29,7 +29,6 @@
* \ingroup DNA
*/
#ifndef DNA_CUSTOMDATA_TYPES_H
#define DNA_CUSTOMDATA_TYPES_H

6
source/blender/makesdna/DNA_defs.h
View File

@@ -20,13 +20,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_DEFS_H
#define DNA_DEFS_H
/** \file DNA_defs.h
* \ingroup DNA
*/
#ifndef DNA_DEFS_H
#define DNA_DEFS_H
/* makesdna ignores */
#ifdef DNA_DEPRECATED_ALLOW
/* allow use of deprecated items */

39
source/blender/makesdna/DNA_dynamicpaint_types.h
View File

@@ -1,15 +1,30 @@
/**
* ***** 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.
*
* Contributor(s): Miika Hämäläinen
*
* ***** END GPL LICENSE BLOCK *****
*/
/*
* ***** 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.
*
* Contributor(s): Miika Hämäläinen
*
* ***** END GPL LICENSE BLOCK *****
*
*/
/** \file DNA_dynamicpaint_types.h
* \ingroup DNA
*/
#ifndef DNA_DYNAMICPAINT_TYPES_H
#define DNA_DYNAMICPAINT_TYPES_H

5
source/blender/makesdna/DNA_effect_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_EFFECT_TYPES_H
#define DNA_EFFECT_TYPES_H
/** \file DNA_effect_types.h
* \ingroup DNA
*/
#ifndef DNA_EFFECT_TYPES_H
#define DNA_EFFECT_TYPES_H
/* don't forget, new effects also in writefile.c for dna!!! */
#define PAF_MAXMULT 4

5
source/blender/makesdna/DNA_fileglobal_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_FILEGLOBAL_TYPES_H
#define DNA_FILEGLOBAL_TYPES_H
/** \file DNA_fileglobal_types.h
* \ingroup DNA
*/
#ifndef DNA_FILEGLOBAL_TYPES_H
#define DNA_FILEGLOBAL_TYPES_H
struct bScreen;
struct Scene;

6
source/blender/makesdna/DNA_genfile.h
View File

@@ -25,14 +25,14 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef GENFILE_H
#define GENFILE_H
/** \file DNA_genfile.h
* \ingroup DNA
* \brief blenloader genfile private function prototypes
*/
#ifndef DNA_GENFILE_H
#define DNA_GENFILE_H
struct SDNA;
extern unsigned char DNAstr[]; /* DNA.c */

5
source/blender/makesdna/DNA_gpencil_types.h
View File

@@ -22,13 +22,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_GPENCIL_TYPES_H
#define DNA_GPENCIL_TYPES_H
/** \file DNA_gpencil_types.h
* \ingroup DNA
*/
#ifndef DNA_GPENCIL_TYPES_H
#define DNA_GPENCIL_TYPES_H
#include "DNA_listBase.h"
#include "DNA_ID.h"

5
source/blender/makesdna/DNA_group_types.h
View File

@@ -27,13 +27,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_GROUP_TYPES_H
#define DNA_GROUP_TYPES_H
/** \file DNA_group_types.h
* \ingroup DNA
*/
#ifndef DNA_GROUP_TYPES_H
#define DNA_GROUP_TYPES_H
#include "DNA_listBase.h"
#include "DNA_ID.h"

5
source/blender/makesdna/DNA_image_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_IMAGE_TYPES_H
#define DNA_IMAGE_TYPES_H
/** \file DNA_image_types.h
* \ingroup DNA
*/
#ifndef DNA_IMAGE_TYPES_H
#define DNA_IMAGE_TYPES_H
#include "DNA_ID.h"
struct PackedFile;

5
source/blender/makesdna/DNA_lamp_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_LAMP_TYPES_H
#define DNA_LAMP_TYPES_H
/** \file DNA_lamp_types.h
* \ingroup DNA
*/
#ifndef DNA_LAMP_TYPES_H
#define DNA_LAMP_TYPES_H
#include "DNA_defs.h"
#include "DNA_ID.h"

5
source/blender/makesdna/DNA_lattice_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_LATTICE_TYPES_H
#define DNA_LATTICE_TYPES_H
/** \file DNA_lattice_types.h
* \ingroup DNA
*/
#ifndef DNA_LATTICE_TYPES_H
#define DNA_LATTICE_TYPES_H
#include "DNA_defs.h"
#include "DNA_ID.h"

6
source/blender/makesdna/DNA_listBase.h
View File

@@ -27,15 +27,15 @@
*
*/
#ifndef DNA_LISTBASE_H
#define DNA_LISTBASE_H
/** \file DNA_listBase.h
* \ingroup DNA
* \brief These structs are the foundation for all linked lists in the
* library system.
*/
#ifndef DNA_LISTBASE_H
#define DNA_LISTBASE_H
#ifdef __cplusplus
extern "C" {
#endif

5
source/blender/makesdna/DNA_material_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_MATERIAL_TYPES_H
#define DNA_MATERIAL_TYPES_H
/** \file DNA_material_types.h
* \ingroup DNA
*/
#ifndef DNA_MATERIAL_TYPES_H
#define DNA_MATERIAL_TYPES_H
#include "DNA_defs.h"
#include "DNA_ID.h"
#include "DNA_listBase.h"

5
source/blender/makesdna/DNA_mesh_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_MESH_TYPES_H
#define DNA_MESH_TYPES_H
/** \file DNA_mesh_types.h
* \ingroup DNA
*/
#ifndef DNA_MESH_TYPES_H
#define DNA_MESH_TYPES_H
#include "DNA_defs.h"
#include "DNA_listBase.h"
#include "DNA_ID.h"

5
source/blender/makesdna/DNA_meshdata_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_MESHDATA_TYPES_H
#define DNA_MESHDATA_TYPES_H
/** \file DNA_meshdata_types.h
* \ingroup DNA
*/
#ifndef DNA_MESHDATA_TYPES_H
#define DNA_MESHDATA_TYPES_H
#include "DNA_customdata_types.h"
#include "DNA_listBase.h"

5
source/blender/makesdna/DNA_meta_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_META_TYPES_H
#define DNA_META_TYPES_H
/** \file DNA_meta_types.h
* \ingroup DNA
*/
#ifndef DNA_META_TYPES_H
#define DNA_META_TYPES_H
#include "DNA_listBase.h"
#include "DNA_ID.h"

6
source/blender/makesdna/DNA_modifier_types.h
View File

@@ -18,13 +18,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_MODIFIER_TYPES_H
#define DNA_MODIFIER_TYPES_H
/** \file DNA_modifier_types.h
* \ingroup DNA
*/
#ifndef DNA_MODIFIER_TYPES_H
#define DNA_MODIFIER_TYPES_H
#include "DNA_defs.h"
#include "DNA_listBase.h"

6
source/blender/makesdna/DNA_movieclip_types.h
View File

@@ -26,15 +26,15 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_MOVIECLIP_TYPES_H
#define DNA_MOVIECLIP_TYPES_H
/** \file DNA_movieclip_types.h
* \ingroup DNA
* \since may-2011
* \author Sergey Sharybin
*/
#ifndef DNA_MOVIECLIP_TYPES_H
#define DNA_MOVIECLIP_TYPES_H
#include "DNA_ID.h"
#include "DNA_tracking_types.h"

6
source/blender/makesdna/DNA_nla_types.h
View File

@@ -25,13 +25,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_NLA_TYPES_H
#define DNA_NLA_TYPES_H
/** \file DNA_nla_types.h
* \ingroup DNA
*/
#ifndef DNA_NLA_TYPES_H
#define DNA_NLA_TYPES_H
#include "DNA_listBase.h"
struct bAction;

6
source/blender/makesdna/DNA_node_types.h
View File

@@ -25,13 +25,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_NODE_TYPES_H
#define DNA_NODE_TYPES_H
/** \file DNA_node_types.h
* \ingroup DNA
*/
#ifndef DNA_NODE_TYPES_H
#define DNA_NODE_TYPES_H
#include "DNA_ID.h"
#include "DNA_vec_types.h"
#include "DNA_listBase.h"

5
source/blender/makesdna/DNA_object_fluidsim.h
View File

@@ -26,13 +26,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_OBJECT_FLUIDSIM_H
#define DNA_OBJECT_FLUIDSIM_H
/** \file DNA_object_fluidsim.h
* \ingroup DNA
*/
#ifndef DNA_OBJECT_FLUIDSIM_H
#define DNA_OBJECT_FLUIDSIM_H
#include "DNA_ID.h"
#ifdef __cplusplus

5
source/blender/makesdna/DNA_object_force.h
View File

@@ -26,13 +26,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_OBJECT_FORCE_H
#define DNA_OBJECT_FORCE_H
/** \file DNA_object_force.h
* \ingroup DNA
*/
#ifndef DNA_OBJECT_FORCE_H
#define DNA_OBJECT_FORCE_H
#ifdef __cplusplus
extern "C" {
#endif

5
source/blender/makesdna/DNA_object_types.h
View File

@@ -24,14 +24,15 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_OBJECT_TYPES_H
#define DNA_OBJECT_TYPES_H
/** \file DNA_object_types.h
* \ingroup DNA
* \brief Object is a sort of wrapper for general info.
*/
#ifndef DNA_OBJECT_TYPES_H
#define DNA_OBJECT_TYPES_H
#include "DNA_defs.h"
#include "DNA_listBase.h"
#include "DNA_ID.h"

5
source/blender/makesdna/DNA_outliner_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_OUTLINER_TYPES_H
#define DNA_OUTLINER_TYPES_H
/** \file DNA_outliner_types.h
* \ingroup DNA
*/
#ifndef DNA_OUTLINER_TYPES_H
#define DNA_OUTLINER_TYPES_H
#include "DNA_listBase.h"
struct ID;

6
source/blender/makesdna/DNA_packedFile_types.h
View File

@@ -25,15 +25,15 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_PACKEDFILE_TYPES_H
#define DNA_PACKEDFILE_TYPES_H
/** \file DNA_packedFile_types.h
* \ingroup DNA
* \author nzc
* \since 12-oct-2000 nzc
*/
#ifndef DNA_PACKEDFILE_TYPES_H
#define DNA_PACKEDFILE_TYPES_H
typedef struct PackedFile {
int size;
int seek;

6
source/blender/makesdna/DNA_particle_types.h
View File

@@ -25,13 +25,13 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_PARTICLE_TYPES_H
#define DNA_PARTICLE_TYPES_H
/** \file DNA_particle_types.h
* \ingroup DNA
*/
#ifndef DNA_PARTICLE_TYPES_H
#define DNA_PARTICLE_TYPES_H
#include "DNA_defs.h"
#include "DNA_ID.h"
#include "DNA_boid_types.h"

5
source/blender/makesdna/DNA_property_types.h
View File

@@ -27,8 +27,6 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_PROPERTY_TYPES_H
#define DNA_PROPERTY_TYPES_H
/** \file DNA_property_types.h
* \ingroup DNA
@@ -38,6 +36,9 @@
* hierarchy here is a bit strange, and not desirable.
*/
#ifndef DNA_PROPERTY_TYPES_H
#define DNA_PROPERTY_TYPES_H
/* ********************* PROPERTY ************************ */
typedef struct bProperty {

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

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_SCENE_TYPES_H
#define DNA_SCENE_TYPES_H
/** \file DNA_scene_types.h
* \ingroup DNA
*/
#ifndef DNA_SCENE_TYPES_H
#define DNA_SCENE_TYPES_H
#include "DNA_defs.h"
// XXX, temp feature - campbell
@@ -332,9 +333,15 @@ typedef struct RenderData {
/** For UR edge rendering: give the edges this color */
float edgeR, edgeG, edgeB;
short fullscreen DNA_DEPRECATED, xplay DNA_DEPRECATED, yplay DNA_DEPRECATED, freqplay DNA_DEPRECATED; /* standalone player */ // XXX deprecated since 2.5
short depth DNA_DEPRECATED, attrib DNA_DEPRECATED; /* standalone player */ // XXX deprecated since 2.5
/* standalone player */ // XXX deprecated since 2.5
short fullscreen DNA_DEPRECATED, xplay DNA_DEPRECATED, yplay DNA_DEPRECATED;
short freqplay DNA_DEPRECATED;
/* standalone player */ // XXX deprecated since 2.5
short depth DNA_DEPRECATED, attrib DNA_DEPRECATED;
int frame_step; /* frames to jump during render/playback */
short stereomode DNA_DEPRECATED; /* standalone player stereo settings */ // XXX deprecated since 2.5
@@ -1083,7 +1090,9 @@ typedef struct Scene {
#define R_STAMP_SEQSTRIP 0x0200
#define R_STAMP_RENDERTIME 0x0400
#define R_STAMP_CAMERALENS 0x0800
#define R_STAMP_ALL (R_STAMP_TIME|R_STAMP_FRAME|R_STAMP_DATE|R_STAMP_CAMERA|R_STAMP_SCENE|R_STAMP_NOTE|R_STAMP_MARKER|R_STAMP_FILENAME|R_STAMP_SEQSTRIP|R_STAMP_RENDERTIME|R_STAMP_CAMERALENS)
#define R_STAMP_ALL (R_STAMP_TIME|R_STAMP_FRAME|R_STAMP_DATE|R_STAMP_CAMERA|R_STAMP_SCENE| \
R_STAMP_NOTE|R_STAMP_MARKER|R_STAMP_FILENAME|R_STAMP_SEQSTRIP| \
R_STAMP_RENDERTIME|R_STAMP_CAMERALENS)
/* alphamode */
#define R_ADDSKY 0
@@ -1141,12 +1150,31 @@ typedef struct Scene {
#define MINAFRAMEF -300000.0f
/* depricate this! */
#define TESTBASE(v3d, base) ( ((base)->flag & SELECT) && ((base)->lay & v3d->lay) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
#define TESTBASELIB(v3d, base) ( ((base)->flag & SELECT) && ((base)->lay & v3d->lay) && ((base)->object->id.lib==NULL) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
#define TESTBASELIB_BGMODE(v3d, scene, base) ( ((base)->flag & SELECT) && ((base)->lay & (v3d ? v3d->lay : scene->lay)) && ((base)->object->id.lib==NULL) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
#define BASE_EDITABLE_BGMODE(v3d, scene, base) (((base)->lay & (v3d ? v3d->lay : scene->lay)) && ((base)->object->id.lib==NULL) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
#define BASE_SELECTABLE(v3d, base) ((base->lay & v3d->lay) && (base->object->restrictflag & (OB_RESTRICT_SELECT|OB_RESTRICT_VIEW))==0)
#define BASE_VISIBLE(v3d, base) ((base->lay & v3d->lay) && (base->object->restrictflag & OB_RESTRICT_VIEW)==0)
#define TESTBASE(v3d, base) ( \
((base)->flag & SELECT) && \
((base)->lay & v3d->lay) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
#define TESTBASELIB(v3d, base) ( \
((base)->flag & SELECT) && \
((base)->lay & v3d->lay) && \
((base)->object->id.lib==NULL) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
#define TESTBASELIB_BGMODE(v3d, scene, base) ( \
((base)->flag & SELECT) && \
((base)->lay & (v3d ? v3d->lay : scene->lay)) && \
((base)->object->id.lib==NULL) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
#define BASE_EDITABLE_BGMODE(v3d, scene, base) ( \
((base)->lay & (v3d ? v3d->lay : scene->lay)) && \
((base)->object->id.lib==NULL) && \
(((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
#define BASE_SELECTABLE(v3d, base) ( \
(base->lay & v3d->lay) && \
(base->object->restrictflag & (OB_RESTRICT_SELECT|OB_RESTRICT_VIEW))==0 )
#define BASE_VISIBLE(v3d, base) ( \
(base->lay & v3d->lay) && \
(base->object->restrictflag & OB_RESTRICT_VIEW)==0 )
#define FIRSTBASE scene->base.first
#define LASTBASE scene->base.last
#define BASACT (scene->basact)

5
source/blender/makesdna/DNA_screen_types.h
View File

@@ -22,13 +22,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_SCREEN_TYPES_H
#define DNA_SCREEN_TYPES_H
/** \file DNA_screen_types.h
* \ingroup DNA
*/
#ifndef DNA_SCREEN_TYPES_H
#define DNA_SCREEN_TYPES_H
#include "DNA_listBase.h"
#include "DNA_view2d_types.h"
#include "DNA_vec_types.h"

5
source/blender/makesdna/DNA_sdna_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_SDNA_H
#define DNA_SDNA_H
/**
* \file DNA_sdna_types.h
* \ingroup DNA
*/
#ifndef DNA_SDNA_H
#define DNA_SDNA_H
#
#
typedef struct SDNA {

7
source/blender/makesdna/DNA_sensor_types.h
View File

@@ -24,15 +24,16 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_SENSOR_TYPES_H
#define DNA_SENSOR_TYPES_H
/** \file DNA_sensor_types.h
* \ingroup DNA
* \since mar-2001
* \author nzc
*
*/
#ifndef DNA_SENSOR_TYPES_H
#define DNA_SENSOR_TYPES_H
struct Object;
struct Material;

5
source/blender/makesdna/DNA_sequence_types.h
View File

@@ -24,14 +24,15 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_SEQUENCE_TYPES_H
#define DNA_SEQUENCE_TYPES_H
/** \file DNA_sequence_types.h
* \ingroup DNA
* \since mar-2001
* \author nzc
*/
#ifndef DNA_SEQUENCE_TYPES_H
#define DNA_SEQUENCE_TYPES_H
#include "DNA_defs.h"
#include "DNA_listBase.h"
#include "DNA_vec_types.h"

5
source/blender/makesdna/DNA_smoke_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_SMOKE_TYPES_H
#define DNA_SMOKE_TYPES_H
/** \file DNA_smoke_types.h
* \ingroup DNA
*/
#ifndef DNA_SMOKE_TYPES_H
#define DNA_SMOKE_TYPES_H
/* flags */
#define MOD_SMOKE_HIGHRES (1<<1) /* enable high resolution */
#define MOD_SMOKE_DISSOLVE (1<<2) /* let smoke dissolve */

5
source/blender/makesdna/DNA_sound_types.h
View File

@@ -24,14 +24,15 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_SOUND_TYPES_H
#define DNA_SOUND_TYPES_H
/** \file DNA_sound_types.h
* \ingroup DNA
* \since mar-2001
* \author nzc
*/
#ifndef DNA_SOUND_TYPES_H
#define DNA_SOUND_TYPES_H
#include "DNA_listBase.h"
#include "DNA_ID.h"

5
source/blender/makesdna/DNA_space_types.h
View File

@@ -24,14 +24,15 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_SPACE_TYPES_H
#define DNA_SPACE_TYPES_H
/** \file DNA_space_types.h
* \ingroup DNA
* \since mar-2001
* \author nzc
*/
#ifndef DNA_SPACE_TYPES_H
#define DNA_SPACE_TYPES_H
#include "DNA_defs.h"
#include "DNA_listBase.h"
#include "DNA_color_types.h" /* for Histogram */

5
source/blender/makesdna/DNA_speaker_types.h
View File

@@ -19,13 +19,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_SPEAKER_TYPES_H
#define DNA_SPEAKER_TYPES_H
/** \file DNA_speaker_types.h
* \ingroup DNA
*/
#ifndef DNA_SPEAKER_TYPES_H
#define DNA_SPEAKER_TYPES_H
#include "DNA_ID.h"
struct AnimData;

5
source/blender/makesdna/DNA_text_types.h
View File

@@ -24,14 +24,15 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_TEXT_TYPES_H
#define DNA_TEXT_TYPES_H
/** \file DNA_text_types.h
* \ingroup DNA
* \since mar-2001
* \author nzc
*/
#ifndef DNA_TEXT_TYPES_H
#define DNA_TEXT_TYPES_H
#include "DNA_listBase.h"
#include "DNA_ID.h"

5
source/blender/makesdna/DNA_texture_types.h
View File

@@ -24,8 +24,6 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_TEXTURE_TYPES_H
#define DNA_TEXTURE_TYPES_H
/** \file DNA_texture_types.h
* \ingroup DNA
@@ -33,6 +31,9 @@
* \author nzc
*/
#ifndef DNA_TEXTURE_TYPES_H
#define DNA_TEXTURE_TYPES_H
#include "DNA_defs.h"
#include "DNA_ID.h"
#include "DNA_image_types.h" /* ImageUser */

6
source/blender/makesdna/DNA_tracking_types.h
View File

@@ -26,15 +26,15 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_TRACKING_TYPES_H
#define DNA_TRACKING_TYPES_H
/** \file DNA_tracking_types.h
* \ingroup DNA
* \since may-2011
* \author Sergey Sharybin
*/
#ifndef DNA_TRACKING_TYPES_H
#define DNA_TRACKING_TYPES_H
#include "DNA_listBase.h"
/* match-moving data */

6
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -25,15 +25,15 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_USERDEF_TYPES_H
#define DNA_USERDEF_TYPES_H
/** \file DNA_userdef_types.h
* \ingroup DNA
* \since mar-2001
* \author nzc
*
*/
#ifndef DNA_USERDEF_TYPES_H
#define DNA_USERDEF_TYPES_H
#include "DNA_listBase.h"
#include "DNA_texture_types.h" /* ColorBand */

5
source/blender/makesdna/DNA_vec_types.h
View File

@@ -26,14 +26,15 @@
*
*/
#ifndef DNA_VEC_TYPES_H
#define DNA_VEC_TYPES_H
/** \file DNA_vec_types.h
* \ingroup DNA
* \since dec-2000
* \author nzc
*/
#ifndef DNA_VEC_TYPES_H
#define DNA_VEC_TYPES_H
/* types */
/** vector of two shorts. */

5
source/blender/makesdna/DNA_vfont_types.h
View File

@@ -24,8 +24,6 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_VFONT_TYPES_H
#define DNA_VFONT_TYPES_H
/** \file DNA_vfont_types.h
* \ingroup DNA
@@ -33,6 +31,9 @@
* \author nzc
*/
#ifndef DNA_VFONT_TYPES_H
#define DNA_VFONT_TYPES_H
#include "DNA_ID.h"
struct PackedFile;

5
source/blender/makesdna/DNA_view2d_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_VIEW2D_TYPES_H
#define DNA_VIEW2D_TYPES_H
/** \file DNA_view2d_types.h
* \ingroup DNA
*/
#ifndef DNA_VIEW2D_TYPES_H
#define DNA_VIEW2D_TYPES_H
#include "DNA_vec_types.h"
/* ---------------------------------- */

5
source/blender/makesdna/DNA_view3d_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_VIEW3D_TYPES_H
#define DNA_VIEW3D_TYPES_H
/** \file DNA_view3d_types.h
* \ingroup DNA
*/
#ifndef DNA_VIEW3D_TYPES_H
#define DNA_VIEW3D_TYPES_H
struct ViewDepths;
struct Object;
struct Image;

5
source/blender/makesdna/DNA_windowmanager_types.h
View File

@@ -23,13 +23,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_WINDOWMANAGER_TYPES_H
#define DNA_WINDOWMANAGER_TYPES_H
/** \file DNA_windowmanager_types.h
* \ingroup DNA
*/
#ifndef DNA_WINDOWMANAGER_TYPES_H
#define DNA_WINDOWMANAGER_TYPES_H
#include "DNA_listBase.h"
#include "DNA_vec_types.h"

5
source/blender/makesdna/DNA_world_types.h
View File

@@ -24,13 +24,14 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef DNA_WORLD_TYPES_H
#define DNA_WORLD_TYPES_H
/** \file DNA_world_types.h
* \ingroup DNA
*/
#ifndef DNA_WORLD_TYPES_H
#define DNA_WORLD_TYPES_H
#include "DNA_defs.h"
#include "DNA_ID.h"