Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_ID.h4
-rw-r--r--source/blender/makesdna/DNA_action_types.h6
-rw-r--r--source/blender/makesdna/DNA_brush_types.h2
-rw-r--r--source/blender/makesdna/DNA_camera_types.h2
-rw-r--r--source/blender/makesdna/DNA_collection_types.h2
-rw-r--r--source/blender/makesdna/DNA_constraint_types.h2
-rw-r--r--source/blender/makesdna/DNA_curve_types.h8
-rw-r--r--source/blender/makesdna/DNA_freestyle_types.h2
-rw-r--r--source/blender/makesdna/DNA_image_types.h6
-rw-r--r--source/blender/makesdna/DNA_lamp_types.h2
-rw-r--r--source/blender/makesdna/DNA_lightprobe_types.h2
-rw-r--r--source/blender/makesdna/DNA_material_types.h4
-rw-r--r--source/blender/makesdna/DNA_meta_types.h2
-rw-r--r--source/blender/makesdna/DNA_movieclip_types.h6
-rw-r--r--source/blender/makesdna/DNA_nla_types.h2
-rw-r--r--source/blender/makesdna/DNA_node_types.h12
-rw-r--r--source/blender/makesdna/DNA_object_fluidsim_types.h2
-rw-r--r--source/blender/makesdna/DNA_object_types.h16
-rw-r--r--source/blender/makesdna/DNA_scene_types.h22
-rw-r--r--source/blender/makesdna/DNA_screen_types.h4
-rw-r--r--source/blender/makesdna/DNA_sequence_types.h2
-rw-r--r--source/blender/makesdna/DNA_space_types.h24
-rw-r--r--source/blender/makesdna/DNA_texture_types.h10
-rw-r--r--source/blender/makesdna/DNA_tracking_types.h4
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h14
-rw-r--r--source/blender/makesdna/DNA_windowmanager_types.h22
-rw-r--r--source/blender/makesdna/DNA_world_types.h2
27 files changed, 93 insertions, 93 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index ba8365993c8..46dd67e9d06 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -39,11 +39,11 @@
extern "C" {
#endif
-struct Library;
struct FileData;
+struct GPUTexture;
struct ID;
+struct Library;
struct PackedFile;
-struct GPUTexture;
/* Runtime display data */
struct DrawData;
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 807dbe5be25..a756ab29c48 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -41,10 +41,10 @@
#include "DNA_view2d_types.h"
#include "DNA_userdef_types.h" /* ThemeWireColor */
-struct SpaceLink;
-struct Object;
struct Collection;
struct GHash;
+struct Object;
+struct SpaceLink;
/* ************************************************ */
/* Visualization */
@@ -221,8 +221,8 @@ typedef struct bPoseChannelDrawData {
float bbone_matrix[0][4][4];
} bPoseChannelDrawData;
-struct Mat4;
struct DualQuat;
+struct Mat4;
typedef struct bPoseChannelRuntime {
int bbone_segments;
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index a2721526cf5..ea80a1e1091 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -42,8 +42,8 @@
//#endif
struct CurveMapping;
-struct MTex;
struct Image;
+struct MTex;
struct Material;
typedef struct BrushClone {
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index bb80724c01a..f3cf5680f42 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -42,9 +42,9 @@
extern "C" {
#endif
-struct Object;
struct AnimData;
struct Ipo;
+struct Object;
/* ------------------------------------------- */
/* Stereo Settings */
diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h
index 69843f4a4b6..104c296ae62 100644
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -38,8 +38,8 @@
#include "DNA_listBase.h"
#include "DNA_ID.h"
-struct Object;
struct Collection;
+struct Object;
typedef struct CollectionObject {
struct CollectionObject *next, *prev;
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index c8e55cc15a1..7e1be67dbb6 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -38,8 +38,8 @@
#include "DNA_listBase.h"
struct Action;
-struct Text;
struct Ipo;
+struct Text;
/* channels reside in Object or Action (ListBase) constraintChannels */
// XXX deprecated... old AnimSys
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 9c6b68b865a..2fe67260dbc 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -39,15 +39,15 @@
#define MAXTEXTBOX 256 /* used in readfile.c and editfont.c */
+struct AnimData;
struct BoundBox;
-struct Object;
+struct EditFont;
+struct GHash;
struct Ipo;
struct Key;
struct Material;
+struct Object;
struct VFont;
-struct AnimData;
-struct EditFont;
-struct GHash;
/* These two Lines with # tell makesdna this struct can be excluded. */
#
diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h
index 9d7685355d9..2bd220ef7cd 100644
--- a/source/blender/makesdna/DNA_freestyle_types.h
+++ b/source/blender/makesdna/DNA_freestyle_types.h
@@ -39,8 +39,8 @@
extern "C" {
#endif
-struct FreestyleLineStyle;
struct Collection;
+struct FreestyleLineStyle;
struct Text;
/* FreestyleConfig::flags */
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 8bca051739d..4af6afcb17a 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -36,12 +36,12 @@
#include "DNA_ID.h"
#include "DNA_color_types.h" /* for color management */
+struct GPUTexture;
+struct MovieCache;
struct PackedFile;
+struct RenderResult;
struct Scene;
struct anim;
-struct MovieCache;
-struct RenderResult;
-struct GPUTexture;
/* ImageUser is in Texture, in Nodes, Background Image, Image Window, .... */
/* should be used in conjunction with an ID * to Image. */
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 566afaa1548..4bc47ee99ff 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -40,10 +40,10 @@
#endif
struct AnimData;
-struct bNodeTree;
struct CurveMapping;
struct Ipo;
struct MTex;
+struct bNodeTree;
typedef struct Lamp {
ID id;
diff --git a/source/blender/makesdna/DNA_lightprobe_types.h b/source/blender/makesdna/DNA_lightprobe_types.h
index a6182931b2d..158fae99f43 100644
--- a/source/blender/makesdna/DNA_lightprobe_types.h
+++ b/source/blender/makesdna/DNA_lightprobe_types.h
@@ -36,8 +36,8 @@
extern "C" {
#endif
-struct Object;
struct AnimData;
+struct Object;
typedef struct LightProbe {
ID id;
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index bd81d170e8e..447c65bfabe 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -40,10 +40,10 @@
#define MAX_MTEX 18
#endif
-struct Image;
-struct bNodeTree;
struct AnimData;
+struct Image;
struct Ipo;
+struct bNodeTree;
/* WATCH IT: change type? also make changes in ipo.h */
diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h
index 304e9772ddc..14c6ef33a76 100644
--- a/source/blender/makesdna/DNA_meta_types.h
+++ b/source/blender/makesdna/DNA_meta_types.h
@@ -36,8 +36,8 @@
#include "DNA_listBase.h"
#include "DNA_ID.h"
-struct BoundBox;
struct AnimData;
+struct BoundBox;
struct Ipo;
struct Material;
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h
index 18676eb207d..a160df92c76 100644
--- a/source/blender/makesdna/DNA_movieclip_types.h
+++ b/source/blender/makesdna/DNA_movieclip_types.h
@@ -39,13 +39,13 @@
#include "DNA_tracking_types.h"
#include "DNA_color_types.h" /* for color management */
-struct anim;
struct AnimData;
-struct bGPdata;
struct ImBuf;
struct MovieClipProxy;
-struct MovieTrackingTrack;
struct MovieTrackingMarker;
+struct MovieTrackingTrack;
+struct anim;
+struct bGPdata;
typedef struct MovieClipUser {
/** Current frame number. */
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index eadbb339bca..895c3443ad3 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -34,9 +34,9 @@
#include "DNA_listBase.h"
-struct bAction;
struct Ipo;
struct Object;
+struct bAction;
/* simple uniform modifier structure, assumed it can hold all type info */
typedef struct bActionModifier {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index ddf7175ba40..4698872c73c 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -38,17 +38,17 @@
#include "DNA_texture_types.h"
#include "DNA_scene_types.h"
+struct AnimData;
struct ID;
+struct Image;
struct ListBase;
+struct bGPdata;
+struct bNodeInstanceHash;
struct bNodeLink;
-struct bNodeType;
-struct bNodeTreeExec;
struct bNodePreview;
-struct bNodeInstanceHash;
-struct AnimData;
-struct bGPdata;
+struct bNodeTreeExec;
+struct bNodeType;
struct uiBlock;
-struct Image;
/* In writefile.c: write deprecated DNA data,
* to ensure forward compatibility in 2.6x versions.
diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h
index 82694fef827..b8b6901a8e5 100644
--- a/source/blender/makesdna/DNA_object_fluidsim_types.h
+++ b/source/blender/makesdna/DNA_object_fluidsim_types.h
@@ -39,8 +39,8 @@
extern "C" {
#endif
-struct Mesh;
struct Ipo;
+struct Mesh;
typedef struct FluidVertexVelocity {
float vel[3];
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index db9fa37ebd3..963480ddb5d 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -44,21 +44,21 @@
extern "C" {
#endif
-struct Object;
struct AnimData;
-struct Ipo;
struct BoundBox;
-struct Path;
+struct DerivedMesh;
+struct FluidsimSettings;
+struct GpencilBatchCache;
+struct Ipo;
struct Material;
+struct Object;
struct PartDeflect;
-struct SoftBody;
-struct FluidsimSettings;
struct ParticleSystem;
-struct DerivedMesh;
+struct Path;
+struct RigidBodyOb;
struct SculptSession;
+struct SoftBody;
struct bGPdata;
-struct RigidBodyOb;
-struct GpencilBatchCache;
/* Vertex Groups - Name Info */
typedef struct bDeformGroup {
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 165ae37b3d5..daeab6b005b 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -53,22 +53,22 @@ extern "C" {
#include "DNA_userdef_types.h"
#include "DNA_view3d_types.h"
-struct CurveMapping;
-struct Object;
+struct AnimData;
struct Brush;
-struct World;
-struct Scene;
-struct Image;
struct Collection;
-struct Text;
-struct bNodeTree;
-struct AnimData;
+struct ColorSpace;
+struct CurveMapping;
struct Editing;
-struct SceneStats;
-struct bGPdata;
+struct Image;
struct MovieClip;
-struct ColorSpace;
+struct Object;
+struct Scene;
struct SceneCollection;
+struct SceneStats;
+struct Text;
+struct World;
+struct bGPdata;
+struct bNodeTree;
/* ************************************************************* */
/* Scene Data */
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 682cd5b6d85..e5f1c131798 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -37,12 +37,12 @@
#include "DNA_ID.h"
-struct SpaceType;
-struct SpaceLink;
struct ARegion;
struct ARegionType;
struct PanelType;
struct Scene;
+struct SpaceLink;
+struct SpaceType;
struct uiLayout;
struct wmDrawBuffer;
struct wmTimer;
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index bfaff95addc..08924e63795 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -48,9 +48,9 @@
#include "DNA_vfont_types.h"
struct Ipo;
+struct MovieClip;
struct Scene;
struct bSound;
-struct MovieClip;
/* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index f86b650ddeb..92343efbb39 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -47,25 +47,25 @@
/* Hum ... Not really nice... but needed for spacebuts. */
#include "DNA_view2d_types.h"
+struct BLI_mempool;
+struct FileLayout;
+struct FileList;
+struct FileSelectParams;
+struct Histogram;
struct ID;
-struct Text;
-struct Script;
struct Image;
+struct Mask;
+struct MovieClip;
+struct MovieClipScopes;
struct Scopes;
-struct Histogram;
+struct Script;
struct SpaceIpo;
-struct bNodeTree;
-struct FileList;
-struct bGPdata;
+struct Text;
struct bDopeSheet;
-struct FileSelectParams;
-struct FileLayout;
+struct bGPdata;
+struct bNodeTree;
struct wmOperator;
struct wmTimer;
-struct MovieClip;
-struct MovieClipScopes;
-struct Mask;
-struct BLI_mempool;
/* TODO 2.8: We don't write the global areas to files currently. Uncomment
* define to enable writing (should become the default in a bit). */
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index cc6e557d8f3..418f53edb9e 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -43,14 +43,14 @@ extern "C" {
#endif
struct AnimData;
-struct Ipo;
struct ColorBand;
-struct Object;
-struct Tex;
+struct CurveMapping;
+struct ImBuf;
struct Image;
+struct Ipo;
+struct Object;
struct PreviewImage;
-struct ImBuf;
-struct CurveMapping;
+struct Tex;
typedef struct MTex {
diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h
index 6aad815435c..dc767993a61 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -42,13 +42,13 @@
/* match-moving data */
-struct bGPdata;
struct Image;
struct MovieReconstructedCamera;
+struct MovieTracking;
struct MovieTrackingCamera;
struct MovieTrackingMarker;
struct MovieTrackingTrack;
-struct MovieTracking;
+struct bGPdata;
typedef struct MovieReconstructedCamera {
int framenr;
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 780383e399d..0a5554e0a96 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -32,19 +32,19 @@
#ifndef __DNA_VIEW3D_TYPES_H__
#define __DNA_VIEW3D_TYPES_H__
-struct ViewDepths;
-struct Object;
-struct Image;
-struct SpaceLink;
struct BoundBox;
+struct GPUViewport;
+struct Image;
+struct Material;
struct MovieClip;
struct MovieClipUser;
+struct Object;
struct RenderEngine;
-struct bGPdata;
struct SmoothView3DStore;
+struct SpaceLink;
+struct ViewDepths;
+struct bGPdata;
struct wmTimer;
-struct Material;
-struct GPUViewport;
#include "DNA_defs.h"
#include "DNA_listBase.h"
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 3899e8bcc8d..c3760d66514 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -39,28 +39,28 @@
#include "DNA_ID.h"
/* defined here: */
-struct wmWindowManager;
struct wmWindow;
+struct wmWindowManager;
-struct wmMsgBus;
struct wmEvent;
struct wmGesture;
-struct wmOperatorType;
-struct wmOperator;
-struct wmKeyMap;
struct wmKeyConfig;
+struct wmKeyMap;
+struct wmMsgBus;
+struct wmOperator;
+struct wmOperatorType;
/* forwards */
-struct bContext;
-struct bScreen;
-struct wmSubWindow;
-struct wmTimer;
struct PointerRNA;
-struct ReportList;
struct Report;
-struct uiLayout;
+struct ReportList;
struct Stereo3dFormat;
struct UndoStep;
+struct bContext;
+struct bScreen;
+struct uiLayout;
+struct wmSubWindow;
+struct wmTimer;
#define OP_MAX_TYPENAME 64
#define KMAP_MAX_NAME 64
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index c95436f4723..b5e0ce3db5b 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -36,9 +36,9 @@
#include "DNA_ID.h"
struct AnimData;
-struct bNodeTree;
struct Ipo;
struct MTex;
+struct bNodeTree;
#ifndef MAX_MTEX
#define MAX_MTEX 18