[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42990] trunk/blender/source/blender/ makesdna: minor dna header cleanup

Campbell Barton ideasman42 at gmail.com
Fri Dec 30 08:26:00 CET 2011


Revision: 42990
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42990
Author:   campbellbarton
Date:     2011-12-30 07:25:49 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
minor dna header cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_ID.h
    trunk/blender/source/blender/makesdna/DNA_action_types.h
    trunk/blender/source/blender/makesdna/DNA_anim_types.h
    trunk/blender/source/blender/makesdna/DNA_armature_types.h
    trunk/blender/source/blender/makesdna/DNA_boid_types.h
    trunk/blender/source/blender/makesdna/DNA_brush_types.h
    trunk/blender/source/blender/makesdna/DNA_camera_types.h
    trunk/blender/source/blender/makesdna/DNA_cloth_types.h
    trunk/blender/source/blender/makesdna/DNA_color_types.h
    trunk/blender/source/blender/makesdna/DNA_constraint_types.h
    trunk/blender/source/blender/makesdna/DNA_controller_types.h
    trunk/blender/source/blender/makesdna/DNA_curve_types.h
    trunk/blender/source/blender/makesdna/DNA_customdata_types.h
    trunk/blender/source/blender/makesdna/DNA_defs.h
    trunk/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
    trunk/blender/source/blender/makesdna/DNA_effect_types.h
    trunk/blender/source/blender/makesdna/DNA_fileglobal_types.h
    trunk/blender/source/blender/makesdna/DNA_genfile.h
    trunk/blender/source/blender/makesdna/DNA_gpencil_types.h
    trunk/blender/source/blender/makesdna/DNA_group_types.h
    trunk/blender/source/blender/makesdna/DNA_image_types.h
    trunk/blender/source/blender/makesdna/DNA_lamp_types.h
    trunk/blender/source/blender/makesdna/DNA_lattice_types.h
    trunk/blender/source/blender/makesdna/DNA_listBase.h
    trunk/blender/source/blender/makesdna/DNA_material_types.h
    trunk/blender/source/blender/makesdna/DNA_mesh_types.h
    trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
    trunk/blender/source/blender/makesdna/DNA_meta_types.h
    trunk/blender/source/blender/makesdna/DNA_modifier_types.h
    trunk/blender/source/blender/makesdna/DNA_movieclip_types.h
    trunk/blender/source/blender/makesdna/DNA_nla_types.h
    trunk/blender/source/blender/makesdna/DNA_node_types.h
    trunk/blender/source/blender/makesdna/DNA_object_fluidsim.h
    trunk/blender/source/blender/makesdna/DNA_object_force.h
    trunk/blender/source/blender/makesdna/DNA_object_types.h
    trunk/blender/source/blender/makesdna/DNA_outliner_types.h
    trunk/blender/source/blender/makesdna/DNA_packedFile_types.h
    trunk/blender/source/blender/makesdna/DNA_particle_types.h
    trunk/blender/source/blender/makesdna/DNA_property_types.h
    trunk/blender/source/blender/makesdna/DNA_scene_types.h
    trunk/blender/source/blender/makesdna/DNA_screen_types.h
    trunk/blender/source/blender/makesdna/DNA_sdna_types.h
    trunk/blender/source/blender/makesdna/DNA_sensor_types.h
    trunk/blender/source/blender/makesdna/DNA_sequence_types.h
    trunk/blender/source/blender/makesdna/DNA_smoke_types.h
    trunk/blender/source/blender/makesdna/DNA_sound_types.h
    trunk/blender/source/blender/makesdna/DNA_space_types.h
    trunk/blender/source/blender/makesdna/DNA_speaker_types.h
    trunk/blender/source/blender/makesdna/DNA_text_types.h
    trunk/blender/source/blender/makesdna/DNA_texture_types.h
    trunk/blender/source/blender/makesdna/DNA_tracking_types.h
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/makesdna/DNA_vec_types.h
    trunk/blender/source/blender/makesdna/DNA_vfont_types.h
    trunk/blender/source/blender/makesdna/DNA_view2d_types.h
    trunk/blender/source/blender/makesdna/DNA_view3d_types.h
    trunk/blender/source/blender/makesdna/DNA_windowmanager_types.h
    trunk/blender/source/blender/makesdna/DNA_world_types.h

Modified: trunk/blender/source/blender/makesdna/DNA_ID.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_ID.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_ID.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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

Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_action_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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 @@
 	
 	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 @@
 	
 	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... */

Modified: trunk/blender/source/blender/makesdna/DNA_anim_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_anim_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_anim_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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

Modified: trunk/blender/source/blender/makesdna/DNA_armature_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_armature_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_armature_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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"
 

Modified: trunk/blender/source/blender/makesdna/DNA_boid_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_boid_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_boid_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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 {

Modified: trunk/blender/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_brush_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_brush_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -25,14 +25,14 @@
  * ***** 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 */
 

Modified: trunk/blender/source/blender/makesdna/DNA_camera_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_camera_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_camera_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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"

Modified: trunk/blender/source/blender/makesdna/DNA_cloth_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_cloth_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_cloth_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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

Modified: trunk/blender/source/blender/makesdna/DNA_color_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_color_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_color_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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 */

Modified: trunk/blender/source/blender/makesdna/DNA_constraint_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_constraint_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_constraint_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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 @@
 /* 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;

Modified: trunk/blender/source/blender/makesdna/DNA_controller_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_controller_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_controller_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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;

Modified: trunk/blender/source/blender/makesdna/DNA_curve_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_curve_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_curve_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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"

Modified: trunk/blender/source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_customdata_types.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_customdata_types.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -29,7 +29,6 @@
  *  \ingroup DNA
  */
 
-
 #ifndef DNA_CUSTOMDATA_TYPES_H
 #define DNA_CUSTOMDATA_TYPES_H
 

Modified: trunk/blender/source/blender/makesdna/DNA_defs.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_defs.h	2011-12-30 06:43:17 UTC (rev 42989)
+++ trunk/blender/source/blender/makesdna/DNA_defs.h	2011-12-30 07:25:49 UTC (rev 42990)
@@ -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
+

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list