diff options
Diffstat (limited to 'source/blender/editors')
65 files changed, 263 insertions, 263 deletions
diff --git a/source/blender/editors/armature/BIF_generate.h b/source/blender/editors/armature/BIF_generate.h index e229b0f342a..385c80fbb04 100644 --- a/source/blender/editors/armature/BIF_generate.h +++ b/source/blender/editors/armature/BIF_generate.h @@ -26,11 +26,11 @@ #ifndef __BIF_GENERATE_H__ #define __BIF_GENERATE_H__ -struct ToolSettings; -struct EditBone; struct BArcIterator; -struct bArmature; +struct EditBone; struct ListBase; +struct ToolSettings; +struct bArmature; typedef int (NextSubdivisionFunc)(struct ToolSettings *, struct BArcIterator *, int, int, float[3], float[3]); diff --git a/source/blender/editors/armature/BIF_retarget.h b/source/blender/editors/armature/BIF_retarget.h index 2bd2b80190b..7e278757cc2 100644 --- a/source/blender/editors/armature/BIF_retarget.h +++ b/source/blender/editors/armature/BIF_retarget.h @@ -40,10 +40,10 @@ struct bContext; struct EditBone; -struct RigGraph; -struct RigNode; struct RigArc; struct RigEdge; +struct RigGraph; +struct RigNode; #define USE_THREADS diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 67b8b266269..6ab9504d06b 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -34,19 +34,19 @@ /* internal exports only */ struct wmOperatorType; -struct bContext; -struct Scene; -struct Object; struct Base; +struct Object; +struct Scene; struct bAction; +struct bContext; struct bPoseChannel; -struct bArmature; -struct EditBone; struct Bone; +struct EditBone; +struct bArmature; -struct ListBase; struct LinkData; +struct ListBase; /* ******************************************************* */ /* Armature EditMode Operators */ diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h index bd0d2888568..48912f53e11 100644 --- a/source/blender/editors/armature/meshlaplacian.h +++ b/source/blender/editors/armature/meshlaplacian.h @@ -29,8 +29,8 @@ //#define RIGID_DEFORM -struct Object; struct Mesh; +struct Object; struct bDeformGroup; #ifdef RIGID_DEFORM diff --git a/source/blender/editors/armature/reeb.h b/source/blender/editors/armature/reeb.h index 9eed343f18a..b6dc7613aad 100644 --- a/source/blender/editors/armature/reeb.h +++ b/source/blender/editors/armature/reeb.h @@ -34,8 +34,8 @@ #include "BLI_graph.h" -struct GHash; struct EdgeHash; +struct GHash; struct ReebArc; struct ReebEdge; struct ReebNode; @@ -141,8 +141,8 @@ typedef struct ReebArcIterator { } ReebArcIterator; #if 0 -struct EditMesh; struct EdgeIndex; +struct EditMesh; int weightToHarmonic(struct EditMesh *em, struct EdgeIndex *indexed_edges); int weightFromDistance(struct EditMesh *em, struct EdgeIndex *indexed_edges); diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h index 01047d4badd..20733738466 100644 --- a/source/blender/editors/curve/curve_intern.h +++ b/source/blender/editors/curve/curve_intern.h @@ -33,12 +33,12 @@ #define __CURVE_INTERN_H__ /* internal exports only */ -struct ListBase; struct EditNurb; struct GHash; +struct ListBase; struct Object; -struct wmOperatorType; struct ViewContext; +struct wmOperatorType; /* editfont.c */ enum { DEL_NEXT_CHAR, DEL_PREV_CHAR, DEL_NEXT_WORD, DEL_PREV_WORD, DEL_SELECTION, DEL_NEXT_SEL, DEL_PREV_SEL }; diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index f35a059c85c..7e83497c8ec 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -36,9 +36,9 @@ /* internal exports only */ -struct bGPdata; -struct bGPDstroke; struct bGPDspoint; +struct bGPDstroke; +struct bGPdata; struct GHash; @@ -46,9 +46,9 @@ struct ARegion; struct View2D; struct wmOperatorType; +struct EnumPropertyItem; struct PointerRNA; struct PropertyRNA; -struct EnumPropertyItem; /* ***************************************************** */ diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index ceb1a4f416a..a44c04b043a 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -30,13 +30,13 @@ #ifndef __BIF_GLUTIL_H__ #define __BIF_GLUTIL_H__ -struct rcti; struct rctf; +struct rcti; +struct ColorManagedDisplaySettings; +struct ColorManagedViewSettings; struct ImBuf; struct bContext; -struct ColorManagedViewSettings; -struct ColorManagedDisplaySettings; void fdrawbezier(float vec[4][3]); void fdrawline(float x1, float y1, float x2, float y2); diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index f52117ed4d3..6a9e645f955 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -31,27 +31,27 @@ #ifndef __ED_ANIM_API_H__ #define __ED_ANIM_API_H__ +struct AnimData; struct ID; struct ListBase; -struct AnimData; -struct bContext; +struct ARegion; struct Main; -struct wmKeyConfig; struct ReportList; struct ScrArea; struct SpaceLink; -struct ARegion; struct View2D; +struct bContext; +struct wmKeyConfig; -struct Scene; struct Object; +struct Scene; struct bDopeSheet; -struct bAction; struct FCurve; struct FModifier; +struct bAction; struct uiBlock; struct uiLayout; diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 5c9618aba6c..9fe7724707f 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -34,23 +34,23 @@ extern "C" { #endif -struct bArmature; struct Base; -struct bContext; struct Bone; -struct bPoseChannel; +struct DerivedMesh; struct IDProperty; struct ListBase; struct Main; struct MeshDeformModifierData; -struct DerivedMesh; struct Object; struct ReportList; struct Scene; +struct UndoType; struct ViewContext; +struct bArmature; +struct bContext; +struct bPoseChannel; struct wmKeyConfig; struct wmOperator; -struct UndoType; typedef struct EditBone { struct EditBone *next, *prev; diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h index 4844d96e6e8..af44099bf73 100644 --- a/source/blender/editors/include/ED_clip.h +++ b/source/blender/editors/include/ED_clip.h @@ -32,14 +32,14 @@ #define __ED_CLIP_H__ struct ARegion; -struct bContext; -struct bScreen; struct ImBuf; struct Main; struct Mask; struct MovieClip; -struct SpaceClip; struct Scene; +struct SpaceClip; +struct bContext; +struct bScreen; /* ** clip_editor.c ** */ diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h index 8fcfb4743d5..457f87f39d5 100644 --- a/source/blender/editors/include/ED_curve.h +++ b/source/blender/editors/include/ED_curve.h @@ -31,18 +31,18 @@ #ifndef __ED_CURVE_H__ #define __ED_CURVE_H__ -struct bContext; -struct BezTriple; struct BPoint; +struct BezTriple; struct Curve; struct EditNurb; struct Main; struct Nurb; struct Object; struct Text; -struct wmOperator; -struct wmKeyConfig; struct UndoType; +struct bContext; +struct wmKeyConfig; +struct wmOperator; /* curve_ops.c */ void ED_operatortypes_curve(void); diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h index 6b9cf23ce73..950019c67e5 100644 --- a/source/blender/editors/include/ED_gpencil.h +++ b/source/blender/editors/include/ED_gpencil.h @@ -32,24 +32,24 @@ #include "ED_numinput.h" +struct ARegion; struct ID; +struct KeyframeEditData; struct ListBase; -struct bContext; +struct Object; +struct PointerRNA; struct ScrArea; -struct ARegion; struct View3D; -struct Object; -struct bGPdata; -struct bGPDlayer; +struct bAnimContext; +struct bContext; struct bGPDframe; -struct bGPDstroke; +struct bGPDlayer; struct bGPDpalette; struct bGPDpalettecolor; -struct bAnimContext; -struct KeyframeEditData; -struct PointerRNA; -struct wmWindowManager; +struct bGPDstroke; +struct bGPdata; struct wmKeyConfig; +struct wmWindowManager; /* ------------- Grease-Pencil Helpers ---------------- */ diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index e5631c4e191..6528fbe68ad 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -30,15 +30,15 @@ #ifndef __ED_IMAGE_H__ #define __ED_IMAGE_H__ -struct SpaceImage; -struct bContext; +struct ARegion; +struct ImBuf; struct Image; struct ImageUser; -struct ImBuf; +struct Scene; +struct SpaceImage; struct ToolSettings; +struct bContext; struct wmWindowManager; -struct ARegion; -struct Scene; /* image_edit.c, exported for transform */ struct Image *ED_space_image(struct SpaceImage *sima); diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h index 5f4b8ce40bf..11637c0eaf6 100644 --- a/source/blender/editors/include/ED_keyframes_draw.h +++ b/source/blender/editors/include/ED_keyframes_draw.h @@ -32,20 +32,20 @@ #ifndef __ED_KEYFRAMES_DRAW_H__ #define __ED_KEYFRAMES_DRAW_H__ -struct bAnimContext; struct AnimData; struct CacheFile; +struct DLRBT_Tree; struct FCurve; -struct bDopeSheet; -struct bAction; -struct bActionGroup; -struct Object; struct ListBase; -struct bGPDlayer; struct MaskLayer; +struct Object; struct Scene; struct View2D; -struct DLRBT_Tree; +struct bAction; +struct bActionGroup; +struct bAnimContext; +struct bDopeSheet; +struct bGPDlayer; /* ****************************** Base Structs ****************************** */ diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index 0f477505f81..e697365be9b 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -31,12 +31,12 @@ #ifndef __ED_KEYFRAMES_EDIT_H__ #define __ED_KEYFRAMES_EDIT_H__ +struct BezTriple; +struct FCurve; +struct Scene; struct bAnimContext; struct bAnimListElem; struct bDopeSheet; -struct FCurve; -struct BezTriple; -struct Scene; /* ************************************************ */ /* Common Macros and Defines */ diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h index b4d1b5dec9c..0685514f461 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.h @@ -34,25 +34,25 @@ extern "C" { #endif -struct Main; -struct ListBase; struct ID; +struct ListBase; +struct Main; struct Scene; struct KeyingSet; -struct bAction; -struct FCurve; struct BezTriple; +struct FCurve; +struct bAction; struct bPoseChannel; -struct bContext; struct ReportList; +struct bContext; +struct EnumPropertyItem; struct PointerRNA; struct PropertyRNA; -struct EnumPropertyItem; #include "DNA_anim_types.h" #include "RNA_types.h" @@ -127,8 +127,8 @@ short delete_keyframe(struct ReportList *reports, struct ID *id, struct bAction /* ************ Keying Sets ********************** */ /* forward decl. for this struct which is declared a bit later... */ -struct KeyingSetInfo; struct ExtensionRNA; +struct KeyingSetInfo; /* Polling Callback for KeyingSets */ typedef bool (*cbKeyingSet_Poll)(struct KeyingSetInfo *ksi, struct bContext *C); diff --git a/source/blender/editors/include/ED_lattice.h b/source/blender/editors/include/ED_lattice.h index b30929f5307..932d55f6532 100644 --- a/source/blender/editors/include/ED_lattice.h +++ b/source/blender/editors/include/ED_lattice.h @@ -30,9 +30,9 @@ #ifndef __ED_LATTICE_H__ #define __ED_LATTICE_H__ -struct wmKeyConfig; -struct UndoType; struct Object; +struct UndoType; +struct wmKeyConfig; /* lattice_ops.c */ void ED_operatortypes_lattice(void); diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h index a95e283f218..700b7b94982 100644 --- a/source/blender/editors/include/ED_markers.h +++ b/source/blender/editors/include/ED_markers.h @@ -31,12 +31,12 @@ #ifndef __ED_MARKERS_H__ #define __ED_MARKERS_H__ -struct wmKeyConfig; -struct wmKeyMap; -struct bContext; -struct bAnimContext; struct Scene; struct TimeMarker; +struct bAnimContext; +struct bContext; +struct wmKeyConfig; +struct wmKeyMap; /* Drawing API ------------------------------ */ diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h index 2ab788d5e2a..053ba48d8f0 100644 --- a/source/blender/editors/include/ED_mask.h +++ b/source/blender/editors/include/ED_mask.h @@ -31,11 +31,11 @@ #ifndef __ED_MASK_H__ #define __ED_MASK_H__ -struct bContext; -struct wmKeyConfig; +struct KeyframeEditData; struct MaskLayer; struct MaskLayerShape; -struct KeyframeEditData; +struct bContext; +struct wmKeyConfig; /* mask_edit.c */ void ED_mask_get_size(struct ScrArea *sa, int *width, int *height); diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.h index 46c34d36efc..580331ea0a5 100644 --- a/source/blender/editors/include/ED_mball.h +++ b/source/blender/editors/include/ED_mball.h @@ -31,10 +31,10 @@ #ifndef __ED_MBALL_H__ #define __ED_MBALL_H__ -struct bContext; struct Object; -struct wmKeyConfig; struct UndoType; +struct bContext; +struct wmKeyConfig; void ED_operatortypes_metaball(void); void ED_operatormacros_metaball(void); diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index c2094b4215c..f224dbede92 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -35,34 +35,34 @@ extern "C" { #endif -struct ID; -struct View3D; struct ARegion; -struct bContext; -struct wmOperator; -struct wmKeyConfig; -struct ReportList; -struct ViewContext; -struct bDeformGroup; -struct MDeformVert; -struct Scene; -struct Mesh; -struct MTexPoly; -struct UvVertMap; -struct UvMapVert; -struct BMEditMesh; -struct BMesh; -struct BMVert; -struct BMLoop; struct BMBVHTree; struct BMEdge; +struct BMEditMesh; struct BMFace; -struct UvVertMap; -struct UvMapVert; -struct ToolSettings; +struct BMLoop; +struct BMVert; +struct BMesh; +struct ID; +struct MDeformVert; +struct MTexPoly; +struct Mesh; struct Object; -struct rcti; +struct ReportList; +struct Scene; +struct ToolSettings; struct UndoType; +struct UvMapVert; +struct UvMapVert; +struct UvVertMap; +struct UvVertMap; +struct View3D; +struct ViewContext; +struct bContext; +struct bDeformGroup; +struct rcti; +struct wmKeyConfig; +struct wmOperator; /* editmesh_utils.c */ void EDBM_verts_mirror_cache_begin_ex(struct BMEditMesh *em, const int axis, diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h index 1958466d134..4574fe6a4bf 100644 --- a/source/blender/editors/include/ED_node.h +++ b/source/blender/editors/include/ED_node.h @@ -34,17 +34,17 @@ struct ID; struct Main; struct Scene; +struct Scene; +struct ScrArea; struct Tex; +struct View2D; struct bContext; -struct bNodeTree; struct bNode; -struct bNodeType; struct bNodeSocketType; struct bNodeTree; +struct bNodeTree; struct bNodeTreeType; -struct ScrArea; -struct Scene; -struct View2D; +struct bNodeType; typedef enum { NODE_TOP = 1, diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 3f96d669f1c..9492719a916 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -37,10 +37,13 @@ extern "C" { struct Base; struct EnumPropertyItem; +struct EnumPropertyItem; struct ID; struct Main; struct ModifierData; struct Object; +struct PointerRNA; +struct PropertyRNA; struct ReportList; struct Scene; struct bConstraint; @@ -50,9 +53,6 @@ struct wmKeyConfig; struct wmKeyMap; struct wmOperator; struct wmOperatorType; -struct PointerRNA; -struct PropertyRNA; -struct EnumPropertyItem; struct wmWindowManager; #include "DNA_object_enums.h" diff --git a/source/blender/editors/include/ED_paint.h b/source/blender/editors/include/ED_paint.h index 246419d64aa..b0e12c4b5ed 100644 --- a/source/blender/editors/include/ED_paint.h +++ b/source/blender/editors/include/ED_paint.h @@ -25,13 +25,13 @@ #ifndef __ED_PAINT_H__ #define __ED_PAINT_H__ -struct bContext; -struct wmKeyConfig; -struct wmOperator; struct ImBuf; struct Image; struct UndoStep; struct UndoType; +struct bContext; +struct wmKeyConfig; +struct wmOperator; /* paint_ops.c */ void ED_operatortypes_paint(void); diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h index 00111887332..c360f7ba3a3 100644 --- a/source/blender/editors/include/ED_particle.h +++ b/source/blender/editors/include/ED_particle.h @@ -32,13 +32,13 @@ #ifndef __ED_PARTICLE_H__ #define __ED_PARTICLE_H__ -struct bContext; struct Object; -struct ParticleEditSettings; -struct rcti; struct PTCacheEdit; +struct ParticleEditSettings; struct Scene; struct UndoType; +struct bContext; +struct rcti; /* particle edit mode */ void PE_free_ptcache_edit(struct PTCacheEdit *edit); diff --git a/source/blender/editors/include/ED_physics.h b/source/blender/editors/include/ED_physics.h index 32444beb0fe..9488bc91abd 100644 --- a/source/blender/editors/include/ED_physics.h +++ b/source/blender/editors/include/ED_physics.h @@ -32,12 +32,12 @@ #ifndef __ED_PHYSICS_H__ #define __ED_PHYSICS_H__ -struct bContext; struct ReportList; +struct bContext; struct wmKeyConfig; -struct Scene; struct Object; +struct Scene; /* particle_edit.c */ bool PE_poll(struct bContext *C); diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h index 707d7c6c693..eeda2a3a24b 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.h @@ -30,13 +30,13 @@ #include "DNA_vec_types.h" -struct bContext; struct ID; -struct Main; struct MTex; +struct Main; struct Render; struct Scene; struct ScrArea; +struct bContext; struct wmWindowManager; /* render_ops.c */ diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index b4d9a2629cf..494a9b4e1ff 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -36,18 +36,18 @@ #include "DNA_view2d_types.h" #include "DNA_view3d_types.h" -struct wmWindowManager; -struct wmWindow; -struct wmNotifier; -struct wmEvent; -struct wmKeyConfig; -struct bContext; +struct ARegion; +struct Main; struct Scene; +struct bContext; struct bScreen; -struct ARegion; -struct uiBlock; struct rcti; -struct Main; +struct uiBlock; +struct wmEvent; +struct wmKeyConfig; +struct wmNotifier; +struct wmWindow; +struct wmWindowManager; /* regions */ void ED_region_do_listen(struct bScreen *sc, struct ScrArea *sa, struct ARegion *ar, struct wmNotifier *note); diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h index ee2eff3ebba..28b6428214b 100644 --- a/source/blender/editors/include/ED_sculpt.h +++ b/source/blender/editors/include/ED_sculpt.h @@ -31,14 +31,14 @@ #define __ED_SCULPT_H__ struct ARegion; -struct bContext; +struct ListBase; struct Object; struct RegionView3D; -struct ViewContext; -struct rcti; struct UndoStep; struct UndoType; -struct ListBase; +struct ViewContext; +struct bContext; +struct rcti; /* sculpt.c */ void ED_operatortypes_sculpt(void); diff --git a/source/blender/editors/include/ED_sequencer.h b/source/blender/editors/include/ED_sequencer.h index 18446966c4f..8338e86a246 100644 --- a/source/blender/editors/include/ED_sequencer.h +++ b/source/blender/editors/include/ED_sequencer.h @@ -27,10 +27,10 @@ #ifndef __ED_SEQUENCER_H__ #define __ED_SEQUENCER_H__ -struct bContext; struct Scene; struct Sequence; struct SpaceSeq; +struct bContext; void ED_sequencer_select_sequence_single(struct Scene *scene, struct Sequence *seq, bool deselect_all); void ED_sequencer_deselect_all(struct Scene *scene); diff --git a/source/blender/editors/include/ED_text.h b/source/blender/editors/include/ED_text.h index 858902eeec1..ead56f777d9 100644 --- a/source/blender/editors/include/ED_text.h +++ b/source/blender/editors/include/ED_text.h @@ -30,10 +30,10 @@ #ifndef __ED_TEXT_H__ #define __ED_TEXT_H__ -struct SpaceText; struct ARegion; -struct UndoType; +struct SpaceText; struct TextUndoBuf; +struct UndoType; bool ED_text_region_location_from_cursor(struct SpaceText *st, struct ARegion *ar, const int cursor_co[2], int r_pixel_co[2]); diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 9a0a7f8f1bb..a1e4baa1b0b 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -36,16 +36,16 @@ struct ARegion; struct ListBase; +struct Main; struct Object; +struct SnapObjectContext; +struct SnapObjectParams; struct View3D; struct bContext; struct wmEvent; struct wmKeyConfig; struct wmKeyMap; struct wmOperatorType; -struct Main; -struct SnapObjectContext; -struct SnapObjectParams; void transform_keymap_for_space(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int spaceid); void transform_operatortypes(void); @@ -108,18 +108,18 @@ enum TfmMode { * */ bool calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], float cent2d[2]); -struct TransInfo; struct Base; -struct Scene; struct Object; +struct Scene; +struct TransInfo; struct wmOperator; /* UNUSED */ // int BIF_snappingSupported(struct Object *obedit); +struct ReportList; struct TransformOrientation; struct bContext; -struct ReportList; void BIF_clearTransformOrientation(struct bContext *C); void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *ts); diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h index c20d92963a9..3df015f54d8 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -25,15 +25,15 @@ #ifndef __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__ #define __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__ -struct BMVert; struct BMEdge; struct BMFace; +struct BMVert; +struct ARegion; struct ListBase; -struct Scene; struct Main; struct Object; -struct ARegion; +struct Scene; struct View3D; /* transform_snap_object.c */ diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.h index 784ae33f3b0..d5d54e26a02 100644 --- a/source/blender/editors/include/ED_undo.h +++ b/source/blender/editors/include/ED_undo.h @@ -25,10 +25,10 @@ #ifndef __ED_UNDO_H__ #define __ED_UNDO_H__ +struct UndoStack; struct bContext; struct wmOperator; struct wmOperatorType; -struct UndoStack; /* undo.c */ void ED_undo_push(struct bContext *C, const char *str); diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index 741c586d41f..d93b5072679 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -31,11 +31,11 @@ #ifndef __ED_UTIL_H__ #define __ED_UTIL_H__ -struct bContext; -struct wmOperatorType; +struct PackedFile; struct ScrArea; struct SpaceLink; -struct PackedFile; +struct bContext; +struct wmOperatorType; /* ed_util.c */ diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index e9398bbd94c..075b7082077 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -31,10 +31,10 @@ #define __ED_UVEDIT_H__ struct ARegionType; -struct BMesh; struct BMEditMesh; struct BMFace; struct BMLoop; +struct BMesh; struct Image; struct ImageUser; struct MTexPoly; diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 135e6645d13..0ae1144afd1 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -41,6 +41,9 @@ struct Base; struct BezTriple; struct BoundBox; struct EditBone; +struct GPUFX; +struct GPUFXSettings; +struct GPUOffScreen; struct ImBuf; struct MVert; struct Main; @@ -63,9 +66,6 @@ struct wmOperator; struct wmOperatorType; struct wmWindow; struct wmWindowManager; -struct GPUFX; -struct GPUOffScreen; -struct GPUFXSettings; enum eGPUFXFlags; /* for derivedmesh drawing callbacks, for view3d_select, .... */ diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 5c192d62612..b484a599079 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -38,46 +38,46 @@ /* Struct Declarations */ +struct ARegion; +struct AutoComplete; struct ID; struct IDProperty; +struct ImBuf; +struct Image; +struct ImageUser; struct ListBase; -struct ARegion; -struct ScrArea; -struct bScreen; -struct wmEvent; -struct wmWindow; -struct wmOperator; -struct AutoComplete; -struct bContext; -struct bContextStore; +struct MTex; struct Panel; struct PanelType; struct PointerRNA; struct PropertyRNA; struct ReportList; +struct ScrArea; +struct bContext; +struct bContextStore; +struct bNode; +struct bNodeSocket; +struct bNodeTree; +struct bScreen; struct rcti; +struct uiFontStyle; struct uiList; struct uiStyle; -struct uiFontStyle; struct uiWidgetColors; -struct Image; -struct ImageUser; -struct wmKeyConfig; -struct wmOperatorType; struct uiWidgetColors; -struct MTex; -struct ImBuf; -struct bNodeTree; -struct bNode; -struct bNodeSocket; -struct wmDropBox; struct wmDrag; +struct wmDropBox; +struct wmEvent; struct wmEvent; +struct wmKeyConfig; +struct wmOperator; +struct wmOperatorType; +struct wmWindow; -typedef struct uiBut uiBut; typedef struct uiBlock uiBlock; -typedef struct uiPopupBlockHandle uiPopupBlockHandle; +typedef struct uiBut uiBut; typedef struct uiLayout uiLayout; +typedef struct uiPopupBlockHandle uiPopupBlockHandle; /* Defines */ diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index 308504ef4c4..76d2f83b9c1 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -32,11 +32,11 @@ #ifndef __UI_INTERFACE_ICONS_H__ #define __UI_INTERFACE_ICONS_H__ -struct bContext; struct ID; -struct Scene; -struct PreviewImage; struct PointerRNA; +struct PreviewImage; +struct Scene; +struct bContext; enum eIconSizes; diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index a7ae4ea1241..0ab0f4357cf 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -131,13 +131,13 @@ struct View2D; struct View2DGrid; struct View2DScrollers; -struct wmKeyConfig; -struct bScreen; +struct ARegion; struct Scene; struct ScrArea; -struct ARegion; struct bContext; +struct bScreen; struct rctf; +struct wmKeyConfig; typedef struct View2DGrid View2DGrid; typedef struct View2DScrollers View2DScrollers; diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index f2d23944b74..8408819abd7 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -39,19 +39,19 @@ #include "DNA_listBase.h" struct ARegion; +struct ID; +struct ImBuf; +struct Scene; struct bContext; +struct bContextStore; struct uiHandleButtonData; +struct uiLayout; +struct uiStyle; +struct uiWidgetColors; struct wmEvent; struct wmKeyConfig; struct wmOperatorType; struct wmTimer; -struct uiStyle; -struct uiWidgetColors; -struct uiLayout; -struct bContextStore; -struct Scene; -struct ID; -struct ImBuf; /* ****************** general defines ************** */ diff --git a/source/blender/editors/mask/mask_intern.h b/source/blender/editors/mask/mask_intern.h index e9ef06a368f..33939fb211f 100644 --- a/source/blender/editors/mask/mask_intern.h +++ b/source/blender/editors/mask/mask_intern.h @@ -32,8 +32,8 @@ #ifndef __MASK_INTERN_H__ #define __MASK_INTERN_H__ -struct bContext; struct Mask; +struct bContext; struct wmOperatorType; /* internal exports only */ diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 593e6b59d85..b35e108d8ea 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -35,15 +35,15 @@ #define __MESH_INTERN_H__ struct BMEditMesh; -struct BMOperator; struct BMElem; +struct BMOperator; struct EnumPropertyItem; +struct LinkNode; struct bContext; struct wmKeyConfig; struct wmKeyMap; struct wmOperator; struct wmOperatorType; -struct LinkNode; /* *** editmesh_utils.c *** */ diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index f962f83844b..662457fc87b 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -31,11 +31,11 @@ #ifndef __OBJECT_INTERN_H__ #define __OBJECT_INTERN_H__ -struct wmOperatorType; struct Object; -struct bContext; struct StructRNA; +struct bContext; struct wmOperator; +struct wmOperatorType; struct ModifierData; diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h index a00ab742386..ee06b5a35bf 100644 --- a/source/blender/editors/render/render_intern.h +++ b/source/blender/editors/render/render_intern.h @@ -32,10 +32,10 @@ #ifndef __RENDER_INTERN_H__ #define __RENDER_INTERN_H__ -struct bContext; struct RenderEngine; -struct wmOperatorType; struct ScrArea; +struct bContext; +struct wmOperatorType; /* render_shading.c */ void OBJECT_OT_material_slot_add(struct wmOperatorType *ot); diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index b782a47192a..da57ca5a01a 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -33,29 +33,29 @@ #define __PAINT_INTERN_H__ struct ARegion; -struct bContext; struct Brush; -struct ImagePool; -struct ColorSpace; struct ColorManagedDisplay; +struct ColorSpace; +struct DMCoNo; +struct ImagePool; struct ListBase; struct MTex; struct Object; -struct PaintStroke; struct Paint; struct PaintCurve; +struct PaintStroke; struct PointerRNA; -struct rcti; -struct Scene; struct RegionView3D; +struct Scene; +struct UndoStep; struct VPaint; struct ViewContext; +struct bContext; +struct rcti; struct wmEvent; struct wmOperator; struct wmOperatorType; struct wmWindowManager; -struct DMCoNo; -struct UndoStep; enum ePaintMode; /* paint_stroke.c */ diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 137e957dce6..987e7bb2501 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -42,11 +42,11 @@ #include "BKE_pbvh.h" -struct bContext; struct KeyBlock; struct Object; -struct SculptUndoNode; struct SculptOrigVertData; +struct SculptUndoNode; +struct bContext; bool sculpt_mode_poll(struct bContext *C); bool sculpt_mode_poll_view3d(struct bContext *C); diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h index 37bef41e4d5..027a0a4c898 100644 --- a/source/blender/editors/space_action/action_intern.h +++ b/source/blender/editors/space_action/action_intern.h @@ -31,12 +31,12 @@ #ifndef __ACTION_INTERN_H__ #define __ACTION_INTERN_H__ -struct bContext; -struct bAnimContext; -struct SpaceAction; -struct ScrArea; struct ARegion; struct ARegionType; +struct ScrArea; +struct SpaceAction; +struct bAnimContext; +struct bContext; struct wmOperatorType; /* internal exports only */ diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h index ae15834a1d9..4578ec06410 100644 --- a/source/blender/editors/space_clip/clip_intern.h +++ b/source/blender/editors/space_clip/clip_intern.h @@ -32,7 +32,6 @@ #ifndef __CLIP_INTERN_H__ #define __CLIP_INTERN_H__ -struct bContext; struct ARegion; struct MovieClip; struct MovieTrackingMarker; @@ -40,6 +39,7 @@ struct MovieTrackingTrack; struct Scene; struct ScrArea; struct SpaceClip; +struct bContext; struct wmOperatorType; /* channel heights */ diff --git a/source/blender/editors/space_clip/tracking_ops_intern.h b/source/blender/editors/space_clip/tracking_ops_intern.h index b53799b88d8..6cb2c97325a 100644 --- a/source/blender/editors/space_clip/tracking_ops_intern.h +++ b/source/blender/editors/space_clip/tracking_ops_intern.h @@ -32,10 +32,10 @@ #ifndef __TRACKING_OPS_INTERN_H__ #define __TRACKING_OPS_INTERN_H__ -struct bContext; struct ListBase; struct MovieClip; struct SpaceClip; +struct bContext; /* tracking_utils.c */ diff --git a/source/blender/editors/space_console/console_intern.h b/source/blender/editors/space_console/console_intern.h index a272464e0d9..ca2e7679212 100644 --- a/source/blender/editors/space_console/console_intern.h +++ b/source/blender/editors/space_console/console_intern.h @@ -30,8 +30,8 @@ /* internal exports only */ struct ConsoleLine; -struct wmOperatorType; struct bContext; +struct wmOperatorType; /* console_draw.c */ void console_textview_main(struct SpaceConsole *sc, struct ARegion *ar); diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index 6eaf2dda084..725b92b0dfa 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -59,8 +59,8 @@ void file_draw_check_cb(bContext *C, void *arg1, void *arg2); bool file_draw_check_exists(SpaceFile *sfile); /* file_ops.h */ -struct wmOperatorType; struct wmOperator; +struct wmOperatorType; typedef enum WalkSelectDirection { FILE_SELECT_WALK_UP, diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h index c50e0497519..edc31349250 100644 --- a/source/blender/editors/space_graph/graph_intern.h +++ b/source/blender/editors/space_graph/graph_intern.h @@ -31,14 +31,14 @@ #ifndef __GRAPH_INTERN_H__ #define __GRAPH_INTERN_H__ -struct bContext; -struct bAnimContext; -struct bAnimListElem; -struct SpaceIpo; -struct ScrArea; struct ARegion; struct ARegionType; +struct ScrArea; +struct SpaceIpo; struct View2DGrid; +struct bAnimContext; +struct bAnimListElem; +struct bContext; /* internal exports only */ diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h index f7fec4ed396..4b55d3bbcb2 100644 --- a/source/blender/editors/space_image/image_intern.h +++ b/source/blender/editors/space_image/image_intern.h @@ -33,13 +33,13 @@ #define __IMAGE_INTERN_H__ /* internal exports only */ -struct bContext; struct ARegion; struct ARegionType; struct ScrArea; struct SpaceImage; -struct wmOperatorType; +struct bContext; struct bNodeTree; +struct wmOperatorType; /* space_image.c */ struct ARegion *image_has_buttons_region(struct ScrArea *sa); diff --git a/source/blender/editors/space_info/info_intern.h b/source/blender/editors/space_info/info_intern.h index a16acd665b4..3c059631740 100644 --- a/source/blender/editors/space_info/info_intern.h +++ b/source/blender/editors/space_info/info_intern.h @@ -33,9 +33,9 @@ /* internal exports only */ +struct ReportList; struct SpaceInfo; struct wmOperatorType; -struct ReportList; void FILE_OT_autopack_toggle(struct wmOperatorType *ot); void FILE_OT_pack_all(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_logic/logic_intern.h b/source/blender/editors/space_logic/logic_intern.h index ddbb145440d..429daac5092 100644 --- a/source/blender/editors/space_logic/logic_intern.h +++ b/source/blender/editors/space_logic/logic_intern.h @@ -33,9 +33,9 @@ #define __LOGIC_INTERN_H__ /* internal exports only */ -struct bContext; struct ARegion; struct ScrArea; +struct bContext; struct wmOperatorType; /* space_logic.c */ diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 2f13622f1fd..6eb07e35223 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -39,14 +39,14 @@ struct ARegion; struct ARegionType; +struct Main; struct View2D; struct bContext; -struct Main; -struct wmWindow; struct bNode; -struct bNodeSocket; struct bNodeLink; +struct bNodeSocket; struct wmKeyConfig; +struct wmWindow; /* temp data to pass on to modal */ typedef struct bNodeLinkDrag { diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index dabb95e9d2b..6bb191d6388 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -36,14 +36,14 @@ /* internal exports only */ -struct wmOperatorType; -struct TreeStoreElem; -struct bContext; -struct Scene; +struct EditBone; struct ID; struct Object; +struct Scene; +struct TreeStoreElem; +struct bContext; struct bPoseChannel; -struct EditBone; +struct wmOperatorType; typedef struct TreeElement { struct TreeElement *next, *prev, *parent; diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index e06f4558f00..0b6765f200f 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -36,17 +36,17 @@ /* internal exports only */ -struct Sequence; -struct bContext; -struct rctf; -struct SpaceSeq; -struct ScrArea; struct ARegion; struct ARegionType; -struct Scene; struct Main; -struct wmOperator; +struct Scene; +struct ScrArea; +struct Sequence; +struct SpaceSeq; struct StripElem; +struct bContext; +struct rctf; +struct wmOperator; /* space_sequencer.c */ struct ARegion *sequencer_has_buttons_region(struct ScrArea *sa); @@ -88,8 +88,8 @@ extern EnumPropertyItem sequencer_prop_effect_types[]; extern EnumPropertyItem prop_side_types[]; /* operators */ -struct wmOperatorType; struct wmKeyConfig; +struct wmOperatorType; void SEQUENCER_OT_cut(struct wmOperatorType *ot); void SEQUENCER_OT_slip(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index 02948d35623..b22ec86b444 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -34,11 +34,11 @@ /* internal exports only */ struct ARegion; -struct bContext; struct ScrArea; struct SpaceText; struct Text; struct TextLine; +struct bContext; struct wmOperatorType; /* text_draw.c */ diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 962a58768d1..9b51f3a3bc3 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -39,16 +39,16 @@ struct ARegion; struct ARegionType; struct BoundBox; struct DerivedMesh; +struct Mesh; struct Object; struct SmokeDomainSettings; struct bAnimVizSettings; struct bContext; struct bMotionPath; struct bPoseChannel; -struct Mesh; +struct wmKeyConfig; struct wmOperatorType; struct wmWindowManager; -struct wmKeyConfig; /* drawing flags: */ enum { diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index cae5f4bdeb8..16e53c4cbe7 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -41,25 +41,25 @@ /* ************************** Types ***************************** */ -struct TransInfo; -struct TransData; -struct TransformOrientation; -struct TransSnap; +struct ARegion; +struct EditBone; struct NumInput; struct Object; -struct View3D; -struct ScrArea; +struct ReportList; struct Scene; +struct ScrArea; +struct SnapObjectContext; +struct TransData; +struct TransInfo; +struct TransSnap; +struct TransformOrientation; +struct View3D; struct bConstraint; -struct wmKeyMap; -struct wmKeyConfig; struct bContext; struct wmEvent; +struct wmKeyConfig; +struct wmKeyMap; struct wmTimer; -struct ARegion; -struct ReportList; -struct EditBone; -struct SnapObjectContext; /* transinfo->redraw */ typedef enum { @@ -202,8 +202,8 @@ typedef struct TransDataNla { int handle; /* handle-index: 0 for dummy entry, -1 for start, 1 for end, 2 for both ends */ } TransDataNla; -struct LinkNode; struct GHash; +struct LinkNode; /* header of TransDataEdgeSlideVert, TransDataEdgeSlideEdge */ typedef struct TransDataGenericSlideVert { diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index a9162d26d72..9d14ecffdfe 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -32,15 +32,15 @@ #ifndef __UVEDIT_INTERN_H__ #define __UVEDIT_INTERN_H__ -struct MTexPoly; +struct BMEditMesh; +struct BMFace; +struct BMLoop; struct Image; +struct MTexPoly; struct Object; struct Scene; struct SpaceImage; struct wmOperatorType; -struct BMEditMesh; -struct BMFace; -struct BMLoop; /* visibility and selection */ bool uvedit_face_visible_nolocal(struct Scene *scene, struct BMFace *efa); diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index d01695ca2f8..ab4befe1ffd 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -92,11 +92,11 @@ typedef struct PHash { -struct PVert; +struct PChart; struct PEdge; struct PFace; -struct PChart; struct PHandle; +struct PVert; /* Simplices */ |