minor dna header cleanup
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Dec 2011 07:25:49 +0000 (07:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Dec 2011 07:25:49 +0000 (07:25 +0000)
58 files changed:
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_anim_types.h
source/blender/makesdna/DNA_armature_types.h
source/blender/makesdna/DNA_boid_types.h
source/blender/makesdna/DNA_brush_types.h
source/blender/makesdna/DNA_camera_types.h
source/blender/makesdna/DNA_cloth_types.h
source/blender/makesdna/DNA_color_types.h
source/blender/makesdna/DNA_constraint_types.h
source/blender/makesdna/DNA_controller_types.h
source/blender/makesdna/DNA_curve_types.h
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_defs.h
source/blender/makesdna/DNA_dynamicpaint_types.h
source/blender/makesdna/DNA_effect_types.h
source/blender/makesdna/DNA_fileglobal_types.h
source/blender/makesdna/DNA_genfile.h
source/blender/makesdna/DNA_gpencil_types.h
source/blender/makesdna/DNA_group_types.h
source/blender/makesdna/DNA_image_types.h
source/blender/makesdna/DNA_lamp_types.h
source/blender/makesdna/DNA_lattice_types.h
source/blender/makesdna/DNA_listBase.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_meta_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_movieclip_types.h
source/blender/makesdna/DNA_nla_types.h
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_object_fluidsim.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_outliner_types.h
source/blender/makesdna/DNA_packedFile_types.h
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_property_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_screen_types.h
source/blender/makesdna/DNA_sdna_types.h
source/blender/makesdna/DNA_sensor_types.h
source/blender/makesdna/DNA_sequence_types.h
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesdna/DNA_sound_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_speaker_types.h
source/blender/makesdna/DNA_text_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesdna/DNA_tracking_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_vec_types.h
source/blender/makesdna/DNA_vfont_types.h
source/blender/makesdna/DNA_view2d_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/makesdna/DNA_world_types.h

index 8de7ae39a55c0a9378e22a663ae9a0bc959616a3..f0e126db813c147adad4cc7e1476cb30e47a8eef 100644 (file)
  *
  * ***** 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
index 7dce437e543504f2470b6ca95b5032a49e82b49f..9cee4e188ff728c59f449550477cecef2f928c56 100644 (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... */
index e1dfd652900a4c9241b8de8d4a1addfb79bca649..2233da86385377bdacf811349484449a43493d84 100644 (file)
  * ***** 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
index 442fc3ddcce6ef0007e3bb13a06a8743ce252cd5..45c30315575dc8063867b989f5de879c5e7392d4 100644 (file)
  * ***** 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"
 
index 4de03f550772d7bd4f8923f00d8bfe81e7e09c05..53ff51790494d7e43cec8bff70e412c2183ec6bc 100644 (file)
  * ***** 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 {
index 1dfef2258284a2ee0414f5b0687d9be4fe81971f..e5c500f1fea535afafdad94c4fdcf52f6f2f01f9 100644 (file)
  * ***** 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 */
index ff04a7fd3665edcf6d23171bfc0801c92ea74d3c..a46be730d6c9a2521cd147125b165be9972519b4 100644 (file)
  *
  * ***** 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"
index 7b2fb292d2750efcee545be0fca76ddda9032184..5c333c3fc1fc4019acd522869edcae5601125c17 100644 (file)
  *
  * ***** 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
index f3cfab4503bab1e7a3cf0e51b50fda0cacb4d2cd..f5762f8b49ff440c704f5f2b146851eae67c6b73 100644 (file)
  *
  * ***** 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 */
index 87c680a6ee2636b7208cdc91748cce5797d70b2b..dd18ba903f6a5fb5c2db48b9e64844f2a3a18ef8 100644 (file)
  * 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;
index 049e7bd4886b29f80bfd875357a42f343003abc4..c8f4325d71794f742b2c40cc50907a513f96e5e2 100644 (file)
  *
  * ***** 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;
index 545829911e5fd9cbca3c5a8cf0ea086857fea56a..ffcc516f393a6388e3123609f3d90292f99f8a47 100644 (file)
  *
  * ***** 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"
index 0b0ffb42ba899ebb4da4db02c60a109ed047f245..8259eea42ce42873c969958394fac0fb84e93c29 100644 (file)
@@ -29,7 +29,6 @@
  *  \ingroup DNA
  */
 
-
 #ifndef DNA_CUSTOMDATA_TYPES_H
 #define DNA_CUSTOMDATA_TYPES_H
 
index 54dfc18a03c29a1e3691ca4c0d882e1095ac55f0..575938da653ea10158892b9a6ed65c15de401166 100644 (file)
  * ***** 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 */
index fdfd1e2b754f743d0c8aaa4d3ea24394843263eb..d58e11d96405a5b4415c037944e8634269b5c295 100644 (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
 
index 237360f003e6598ef85e356d088b12b0865d5741..b7437b5e9732b5f279b0ab6d5a46623a760a93fd 100644 (file)
  *
  * ***** 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
index c606e5132d248e32f6e951deb44b463008719ba1..31ad628d63086d2ec1aec19669dd6c4d6018abb6 100644 (file)
  *
  * ***** 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;
 
index be13c8bba4f48021ead46315648903d046544028..6516b50402dab31ef2bc95cd66c3046eec936fa7 100644 (file)
  * ***** 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 */
index a4d0b3685e3e780f4c9d58f5e04b8244a619fcc5..71f0dbb60b172d67c9644493aba567db58d32a15 100644 (file)
  *
  * ***** 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"
 
index e174900aa8de84442ffa6fb7b285037144e8ba57..ab42086d6d0118ceb184f73e2662a96b3b26ea39 100644 (file)
  *
  * ***** 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"
 
index 4c3cc0ac0eb5a9814f94c3e5715c4a5ef3d78ac6..fc8807d0f7cfc831e129401acbb5132be0280368 100644 (file)
  *
  * ***** 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;
index 1c22583b82c5781a437cf8980bebbd8897919d35..18fbde8a3c32f9f9b29709da92fb2806554c9777 100644 (file)
  *
  * ***** 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"
 
index baa2f5f911ab096f82bac182988a739e9437c831..2a67afb57083bf685859a1b505284db466107efe 100644 (file)
  *
  * ***** 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"
 
index 6a472272382dee6580c62274555a687404ec1e96..99ad6f41e96b06e6f6fd6769ab7a3f780a8677e7 100644 (file)
  *
  */
 
-#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
index 189f52eead95ee929d3e55720f3ef998044bb3e8..55e9328a72a66eee19d8b5339b6e5b338e233123 100644 (file)
  *
  * ***** 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"
index eae7102ef42eb8e7e0072fbf46b5df7e444d99e1..1dc96190c67969d3013442905c093eef35abead5 100644 (file)
  *
  * ***** 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"
index ab4b560943f91d9fb1b1d8c3d269b6de49340f1e..ce9d1538fed08845e71d7b9ea0e266d46f466f6d 100644 (file)
  *
  * ***** 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"
 
index 1ce90e7d526418e19fdbe16527813f95f5a052f7..ae658cee8f57e32da0c962727b87fbc9c1710c0a 100644 (file)
  *
  * ***** 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"
 
index da77f7a85cfe279958c24185891a6bfb99f74c09..2b62f70c3199312c01c683d2c634b4164c918ab0 100644 (file)
  * ***** 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"
 
index 1a065741121177a034d6ca0d2edd14d6ae31400c..5d2f2f5978fc90c6c7b3672469afaa8f505bb088 100644 (file)
  * ***** 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"
 
index b92cf5c67e4a4f2f88e13e256159963db140f98f..a28097e8449bf478ad264098915a8df9e86b7651 100644 (file)
  * ***** 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;
index 2dfc05bda042e2bb93a359404445fc82cb0716bd..aa9b43584fde3f3a17bb665253fa7138c378f5ae 100644 (file)
  * ***** 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"
index fd6f4afd59331a803f0a4598da90f01292f51a20..022dc53848f267c76f6ed09729b6910446e3c092 100644 (file)
  *
  * ***** 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
index 61fc44d94ffaf01aac362f2c742f018d5fda3dd6..5875ff30bcc9ff29db18807d46429d8232fe2f3c 100644 (file)
  *
  * ***** 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
index 46b971e8e0dcbb255ed1d0f1bdb2942ae8b8e34c..7f1239195ec7b7d2fc1aaaeb3d97f7524ad84a99 100644 (file)
  *
  * ***** 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"
index ec8f85ea91fba335ffc4eae05db583d5a61693f4..ee3903c3b406bcf9509b4f303714c96f01e5c116 100644 (file)
  *
  * ***** 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;
index bbbbf39619b8d95f007e4b52f3f5c315322c2145..91134c2c57563ea3023ad1ff65b374dbe615bb76 100644 (file)
  * ***** 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;
index 504c847a9ea7bb489f3d4bb1757f7d8cff5ea920..07efd17df7f95a578e04ddeac42bafb8dba6743e 100644 (file)
  * ***** 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"
index 004016606a5a25e713f2c2eb35f4763cffcab133..e74ae41a421e957d8af0fccf84c55ef0081b0aa3 100644 (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 {
index 64b5bda3fc8be1ea5ec23a0255f1a6335a41169a..d1ab12433fb6b7371ecc2f3f2d2fe263d37dd981 100644 (file)
  *
  * ***** 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)
index c90a0acc2730c757ba2d4031b85c67714148636c..504c8da7612347951453cd7c29fb193d89f7f1e5 100644 (file)
  *
  * ***** 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"
index b3419a77aabd9020c282988225fee67f6ac11cc2..462ff8ce04594a3d0e2d6ab840a39b89f36f5e5b 100644 (file)
  *
  * ***** 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 {
index 451774b1abb9d64d8a2063b88d7752a92ae9a5d1..e7444b06898b44318d1888a13385e433d7ba9c27 100644 (file)
  *
  * ***** 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;
 
index 50f406afbf97e09b6d6f2ac49bf073b9ee6484c8..aab20dbeee1d9329b47759a7a5d78f146031c841 100644 (file)
  *
  * ***** 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"
index 5b3aae6e4a8ca3332e6536893d6970ef5a6dfab3..ed764c4f644265a0369b432f53e6df1a92022cd4 100644 (file)
  *
  * ***** 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 */
index b83ab0f9f75630c62227cd8cbd154fa0ff0fb865..f530730a544d27b78279c66d71aec689a3024abf 100644 (file)
  *
  * ***** 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"
 
index 29967dfc1bd6ea0c865cf3c55b6338045ea09994..d502e56bf10cb0797fd8b78de628f04eaa833051 100644 (file)
  *
  * ***** 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 */
index 02106fa45adde72bc19caabb71082c9bb87edb09..2e8227f4f92223556d2ad6bd160ee23ba39cedc7 100644 (file)
  *
  * ***** 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;
index 18622cfe75f71d777b5d24f8cf28f5fabda86327..67f3c5288f69963d51173d243b8e87b701c5d2e6 100644 (file)
  *
  * ***** 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"
 
index 5d060f152aa96132d52a621d6f8e7a65c61991b7..82ffa82cf60898d0a9dd46f6e88d5d68fc52a500 100644 (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 */
index 82ccbf87c0b5508875332b6da78e6d3e9ca56727..a93ce75ebc9d9a702793fd5b7bb35a4ae3dfd260 100644 (file)
  * ***** 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 */
index b30a1baf7bb6b966dae67f3225dec7c9b376da6e..b33984605009c9acea32629317354d88b3d76815 100644 (file)
  * ***** 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 */
 
index 75ac69cb3798c857b8c67feda57f45980c458566..10135ba85e9231d5771925f96558d41a5b7ff183 100644 (file)
  * 
  */
 
-#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. */
index d51b59b966ec3ed84382a8b19933a7dfd959e4b9..7132751848d85636f4cb20a46170c65163107966 100644 (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;
index 8f64246db310392532a5d25eb36f99a98a27f726..0581cad4170dcd7087340b171ffeda5ea0cf8150 100644 (file)
  *
  * ***** 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"
 
 /* ---------------------------------- */
index 51ee8f63df513315cff9468bc4b071315c9526b8..ae026b0bcc909f9a1c681e1bfb51ad47bc58a7ab 100644 (file)
  *
  * ***** 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;
index 0065fc110c3c27f8d9474d709ebba8934ab6517e..57989424d4a4250f6f70a14668869afc2d1a6180 100644 (file)
  *
  * ***** 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"
 
index 149393b6723ee5507718198c64b9f430b4531ce3..a04ea89a291638fd045b946fea7c1e5aa926bd87 100644 (file)
  *
  * ***** 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"