diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
commit | 18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 (patch) | |
tree | b35fd8ad683c79a5cbd9f8419220ee1892cd9ef8 /source/blender/makesdna | |
parent | 332548753008f941d920c8a9ee1079dbf1895d37 (diff) | |
parent | b3727668168075137f2ded11d7a7821548e4451d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
24 files changed, 0 insertions, 27 deletions
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index e590780f1ff..6e3573b9f80 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -470,4 +470,3 @@ enum { #define SURF_SEEN 4 #endif - diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h index 964b330a452..373b1584c77 100644 --- a/source/blender/makesdna/DNA_effect_types.h +++ b/source/blender/makesdna/DNA_effect_types.h @@ -139,4 +139,3 @@ typedef struct WaveEff { } WaveEff; #endif - diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h index ed9640c365f..24fb1c86627 100644 --- a/source/blender/makesdna/DNA_fileglobal_types.h +++ b/source/blender/makesdna/DNA_fileglobal_types.h @@ -62,4 +62,3 @@ typedef struct FileGlobal { #endif - diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index f97935a09a1..5f6ca277615 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -507,6 +507,3 @@ typedef struct Ipo { #define IPO_DRIVER_FLAG_INVALID (1<<0) #endif - - - diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h index e1ab56a0206..ff649f3ffe3 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_lamp_types.h @@ -152,4 +152,3 @@ typedef struct Lamp { #define LA_AREA_ELLIPSE 5 #endif /* __DNA_LAMP_TYPES_H__ */ - diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h index e329743cce7..71d6b3bbb0e 100644 --- a/source/blender/makesdna/DNA_lattice_types.h +++ b/source/blender/makesdna/DNA_lattice_types.h @@ -83,4 +83,3 @@ typedef struct Lattice { #define LT_ACTBP_NONE -1 #endif - diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h index 614e06537f4..bfdd21807b8 100644 --- a/source/blender/makesdna/DNA_layer_types.h +++ b/source/blender/makesdna/DNA_layer_types.h @@ -156,4 +156,3 @@ typedef struct SceneCollection { #endif #endif /* __DNA_LAYER_TYPES_H__ */ - diff --git a/source/blender/makesdna/DNA_listBase.h b/source/blender/makesdna/DNA_listBase.h index f6035cd6653..ad359efa4d5 100644 --- a/source/blender/makesdna/DNA_listBase.h +++ b/source/blender/makesdna/DNA_listBase.h @@ -67,4 +67,3 @@ typedef struct ListBase { #endif #endif - diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 9401f591b66..eb469895fd7 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -230,4 +230,3 @@ enum { }; #endif - diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h index c5e14374fb3..72db244c1fe 100644 --- a/source/blender/makesdna/DNA_nla_types.h +++ b/source/blender/makesdna/DNA_nla_types.h @@ -102,4 +102,3 @@ typedef enum eActStrip_Flag { } eActStrip_Flag; #endif - diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h index b8927613a59..0b0c1c40ef4 100644 --- a/source/blender/makesdna/DNA_object_fluidsim_types.h +++ b/source/blender/makesdna/DNA_object_fluidsim_types.h @@ -190,4 +190,3 @@ typedef struct FluidsimSettings { #endif #endif /* __DNA_OBJECT_FLUIDSIM_TYPES_H__ */ - diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h index 6d38e56f19a..ac7c969a810 100644 --- a/source/blender/makesdna/DNA_object_force_types.h +++ b/source/blender/makesdna/DNA_object_force_types.h @@ -407,4 +407,3 @@ typedef struct SoftBody { #endif #endif /* __DNA_OBJECT_FORCE_TYPES_H__ */ - diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 7eb920002f3..3bcc0fb6dcc 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -604,4 +604,3 @@ enum { #endif #endif - diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index d775061d85a..449f71905f0 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -117,4 +117,3 @@ enum { #endif - diff --git a/source/blender/makesdna/DNA_packedFile_types.h b/source/blender/makesdna/DNA_packedFile_types.h index 00a54c2db7f..d2e0dd92cbc 100644 --- a/source/blender/makesdna/DNA_packedFile_types.h +++ b/source/blender/makesdna/DNA_packedFile_types.h @@ -57,5 +57,3 @@ enum ePF_FileStatus { }; #endif /* PACKEDFILE_TYPES_H */ - - diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h index b7d422e7bdf..693707b8b7a 100644 --- a/source/blender/makesdna/DNA_rigidbody_types.h +++ b/source/blender/makesdna/DNA_rigidbody_types.h @@ -328,4 +328,3 @@ typedef enum eRigidBodyCon_Flag { /* ******************************** */ #endif /* __DNA_RIGIDBODY_TYPES_H__ */ - diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 500d198fa74..3ee6bc38644 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -501,4 +501,3 @@ enum { #define RGN_DRAW_REFRESH_UI 8 /* re-create uiBlock's where possible */ #define RGN_DRAW_NO_REBUILD 16 #endif - diff --git a/source/blender/makesdna/DNA_sdna_types.h b/source/blender/makesdna/DNA_sdna_types.h index bd8f23f30c1..27d18e49634 100644 --- a/source/blender/makesdna/DNA_sdna_types.h +++ b/source/blender/makesdna/DNA_sdna_types.h @@ -82,4 +82,3 @@ typedef struct BHead8 { } BHead8; #endif - diff --git a/source/blender/makesdna/DNA_speaker_types.h b/source/blender/makesdna/DNA_speaker_types.h index f7bc3b41e55..a7408293131 100644 --- a/source/blender/makesdna/DNA_speaker_types.h +++ b/source/blender/makesdna/DNA_speaker_types.h @@ -65,4 +65,3 @@ typedef struct Speaker { #define SPK_RELATIVE (1<<2) #endif /* __DNA_SPEAKER_TYPES_H__ */ - diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index bc0b3609a09..ca420195b99 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -549,4 +549,3 @@ enum { #endif #endif - diff --git a/source/blender/makesdna/DNA_vec_types.h b/source/blender/makesdna/DNA_vec_types.h index 7ec259370b5..4a7aaaaa940 100644 --- a/source/blender/makesdna/DNA_vec_types.h +++ b/source/blender/makesdna/DNA_vec_types.h @@ -95,4 +95,3 @@ typedef struct rctf { } rctf; #endif - diff --git a/source/blender/makesdna/DNA_view2d_types.h b/source/blender/makesdna/DNA_view2d_types.h index dce78638328..ebeb639e8aa 100644 --- a/source/blender/makesdna/DNA_view2d_types.h +++ b/source/blender/makesdna/DNA_view2d_types.h @@ -169,4 +169,3 @@ enum { }; #endif - diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index c3e0fe38296..6dbed4d5d6f 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -455,4 +455,3 @@ enum { #define RV3D_CAMZOOM_MAX_FACTOR 44.9852813742385702928f #endif - diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 38bfb20581b..2e38a402abb 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -120,4 +120,3 @@ enum { #define WO_DS_SHOW_TEXS (1<<2) #endif - |