blender
/
blender
137
427
Fork 615
Code Issues 6.3k Pull Requests 793 Projects 19 Wiki Activity

Cleanup: Remove extern "C" from DNA headers #111926

Merged
Julian Eisel merged 1 commits from JulianEisel/blender:temp-dna-extern-c-removal into main 2023-09-04 15:59:48 +02:00
Conversation 1 Commits 1 Files Changed 79 -627
79 changed files with 0 additions and 627 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 92a78f0a05 - Show all commits

8
source/blender/makesdna/DNA_action_types.h
View File

@ -20,10 +20,6 @@
#include "DNA_vec_types.h"
#include "DNA_view2d_types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct Collection;
struct GHash;
struct Object;
@ -980,7 +976,3 @@ typedef struct bActionChannel {
/** Temporary setting - may be used to indicate group that channel belongs to during syncing. */
int temp;
} bActionChannel;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_anim_types.h
View File

@ -15,10 +15,6 @@
#include "DNA_curve_types.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
/* ************************************************ */
/* F-Curve DataTypes */
@ -1204,7 +1200,3 @@ typedef struct IdAdtTemplate {
#define SELECT 1
/* ************************************************ */
#ifdef __cplusplus
};
#endif

3
source/blender/makesdna/DNA_armature_types.h
View File

@ -21,8 +21,6 @@
namespace blender::animrig {
class BoneColor;
}
extern "C" {
#endif
struct AnimData;
@ -434,5 +432,4 @@ inline const blender::animrig::BoneColor &BoneColor::wrap() const
{
return *reinterpret_cast<const blender::animrig::BoneColor *>(this);
}
}
#endif

8
source/blender/makesdna/DNA_asset_types.h
View File

@ -22,10 +22,6 @@ class AssetIdentifier;
#endif
#ifdef __cplusplus
extern "C" {
#endif
/**
* \brief User defined tag.
* Currently only used by assets, could be used more often at some point.
@ -216,7 +212,3 @@ typedef enum eUserExtensionRepo_Flag {
/** Maintain disk cache. */
USER_EXTENSION_FLAG_NO_CACHE = 1 << 0,
} eUserExtensionRepo_Flag;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_boid_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef enum eBoidRuleType {
eBoidRuleType_None = 0,
/** go to goal assigned object or loudest assigned signal source */
@ -220,7 +216,3 @@ enum {
//#define BOID_RULE_LAND (1 << 3) /* goal */
//#define BOID_RULE_WITH_BOIDS (1 << 4) /* avoid collision */
//#define BOID_RULE_WITH_DEFLECTORS (1 << 5) /* avoid collision */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_brush_enums.h
View File

@ -10,10 +10,6 @@
#include "BLI_utildefines.h"
#ifdef __cplusplus
extern "C" {
#endif
/* BrushGpencilSettings->preset_type.
* Use a range for each group and not continuous values. */
typedef enum eGPBrush_Presets {
@ -669,7 +665,3 @@ typedef enum eBrushCurvesSculptDensityMode {
} eBrushCurvesSculptDensityMode;
#define MAX_BRUSH_PIXEL_RADIUS 500
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_brush_types.h
View File

@ -14,10 +14,6 @@
#include "DNA_defs.h"
#include "DNA_texture_types.h" /* for MTex */
#ifdef __cplusplus
extern "C" {
#endif
struct CurveMapping;
struct Image;
struct MTex;
@ -441,7 +437,3 @@ typedef struct PaintCurve {
/** Index where next point will be added. */
int add_index;
} PaintCurve;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_cachefile_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_ID.h"
#ifdef __cplusplus
extern "C" {
#endif
struct GSet;
/* CacheFile::type */
@ -123,7 +119,3 @@ typedef struct CacheFile {
char handle_filepath[1024];
struct GSet *handle_readers;
} CacheFile;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_camera_types.h
View File

@ -14,10 +14,6 @@
#include "DNA_image_types.h"
#include "DNA_movieclip_types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct Ipo;
struct Object;
@ -234,7 +230,3 @@ enum {
enum {
CAM_DOF_ENABLED = (1 << 0),
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_cloth_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* This struct contains all the global data required to run a simulation.
* At the time of this writing, this structure contains data appropriate
@ -243,7 +239,3 @@ typedef enum {
CLOTH_COLLSETTINGS_FLAG_ENABLED = (1 << 1), /* enables cloth - object collisions */
CLOTH_COLLSETTINGS_FLAG_SELF = (1 << 2), /* enables selfcollisions */
} CLOTH_COLLISIONSETTINGS_FLAGS;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_collection_types.h
View File

@ -14,10 +14,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct Collection;
struct Object;
struct GHash;
@ -193,7 +189,3 @@ typedef enum CollectionColorTag {
COLLECTION_COLOR_TOT,
} CollectionColorTag;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_color_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_defs.h"
#include "DNA_vec_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/* general defines for kernel functions */
#define CM_RESOL 32
#define CM_TABLE 256
@ -212,7 +208,3 @@ enum {
COLORMANAGE_VIEW_USE_CURVES = (1 << 0),
COLORMANAGE_VIEW_USE_HDR = (1 << 1),
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_constraint_types.h
View File

@ -13,10 +13,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct Action;
struct Ipo;
struct Text;
@ -1172,7 +1168,3 @@ typedef enum eStretchTo_Flags {
STRETCHTOCON_USE_BULGE_MIN = (1 << 0),
STRETCHTOCON_USE_BULGE_MAX = (1 << 1),
} eStretchTo_Flags;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_curve_types.h
View File

@ -13,10 +13,6 @@
#include "DNA_listBase.h"
#include "DNA_vec_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/** Used in `readfile.cc` and `editfont.cc`. */
#define MAXTEXTBOX 256
@ -613,7 +609,3 @@ enum {
/* indicates point has been seen during surface duplication */
#define SURF_SEEN (1 << 2)
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_curveprofile_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_vec_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Each control point that makes up the profile.
* \note The flags use the same enum as Bezier curves, but they aren't guaranteed
@ -80,7 +76,3 @@ typedef enum eCurveProfilePresets {
PROF_PRESET_CROWN = 3, /* Second molding example. */
PROF_PRESET_STEPS = 4, /* Dynamic number of steps defined by segments_len. */
} eCurveProfilePresets;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_curves_types.h
View File

@ -13,10 +13,6 @@
#include "BLI_utildefines.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
namespace blender::bke {
class CurvesGeometry;
@ -215,7 +211,3 @@ ENUM_OPERATORS(eCurvesSymmetryType, CURVES_SYMMETRY_Z)
/* Only one material supported currently. */
#define CURVES_MATERIAL_NR 1
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_customdata_types.h
View File

@ -14,10 +14,6 @@
#include "BLI_implicit_sharing.h"
#ifdef __cplusplus
extern "C" {
#endif
/** Workaround to forward-declare C++ type in C header. */
#ifdef __cplusplus
namespace blender::bke {
@ -269,7 +265,3 @@ enum {
#define MAX_MTFACE 8
#define DYNTOPO_NODE_NONE -1
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_dynamicpaint_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct PaintSurfaceData;
/* surface format */
@ -261,7 +257,3 @@ typedef struct DynamicPaintBrushSettings {
float wave_factor, wave_clamp;
float max_velocity, smudge_strength;
} DynamicPaintBrushSettings;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_effect_types.h
View File

@ -10,10 +10,6 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
/* Don't forget, new effects also in `writefile.cc` for DNA! */
/** #PartEff::flag. */
@ -142,7 +138,3 @@ typedef struct WaveEff {
float timeoffs, lifetime;
} WaveEff;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_fileglobal_types.h
View File

@ -8,10 +8,6 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
/**
* FileGlobal stores a part of the current user-interface settings at
* the moment of saving, and the file-specific settings.
@ -42,7 +38,3 @@ typedef struct FileGlobal {
/* example: if in 2.43 the meshes lose mesh data, minversion is 2.43 then too */
/* or: in 2.42, subversion 1, same as above, minversion then is 2.42, min subversion 1 */
/* (defines for version are in the BKE_blender_version.h file, for historic reasons) */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_fluid_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* #FluidDomainSettings.flags
* Domain flags.
@ -847,7 +843,3 @@ typedef struct FluidEffectorSettings {
short guide_mode;
char _pad2[2];
} FluidEffectorSettings;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_freestyle_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct Collection;
struct FreestyleLineStyle;
struct Text;
@ -135,7 +131,3 @@ typedef struct FreestyleConfig {
ListBase linesets;
} FreestyleConfig;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_gpencil_legacy_types.h
View File

@ -12,10 +12,6 @@
#include "DNA_brush_types.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct Curve;
struct Curve;
@ -912,7 +908,3 @@ typedef enum eGP_DrawMode {
GP_VERTEX_MASK_SELECTMODE_SEGMENT)))
#define GPENCIL_PLAY_ON(gpd) ((gpd) && ((gpd)->runtime.playing == 1))
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_gpencil_modifier_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct LatticeDeformData;
struct ShrinkwrapTreeData;
@ -1314,7 +1310,3 @@ typedef enum eEnvelopeGpencil_Mode {
GP_ENVELOPE_SEGMENTS = 1,
GP_ENVELOPE_FILLS = 2,
} eEnvelopeGpencil_Mode;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_gpu_types.h
View File

@ -8,10 +8,6 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
/* Keep for 'Camera' versioning. */
/** Properties for DOF effect. */
typedef struct GPUDOFSettings {
@ -25,7 +21,3 @@ typedef struct GPUDOFSettings {
int num_blades;
int high_quality;
} GPUDOFSettings;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_grease_pencil_types.h
View File

@ -44,10 +44,6 @@ typedef struct GreasePencilLayerRuntimeHandle GreasePencilLayerRuntimeHandle;
typedef struct GreasePencilLayerGroupRuntimeHandle GreasePencilLayerGroupRuntimeHandle;
#endif
#ifdef __cplusplus
extern "C" {
#endif
struct GreasePencil;
struct BlendDataReader;
struct BlendWriter;
@ -539,7 +535,3 @@ typedef struct GreasePencil {
void print_layer_tree();
#endif
} GreasePencil;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_image_types.h
View File

@ -12,10 +12,6 @@
#include "DNA_color_types.h" /* for color management */
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
struct GPUTexture;
struct MovieCache;
struct PackedFile;
@ -289,7 +285,3 @@ enum {
IMA_ALPHA_CHANNEL_PACKED = 2,
IMA_ALPHA_IGNORE = 3,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_ipo_types.h
View File

@ -21,10 +21,6 @@
#include "BLI_compiler_attrs.h"
#ifdef __cplusplus
extern "C" {
#endif
/* -------------------------- Type Defines --------------------------- */
/* --- IPO Curve Driver --- */
@ -511,7 +507,3 @@ typedef struct Ipo {
/* driver->flag */
/* invalid flag: currently only used for buggy pydriver expressions */
#define IPO_DRIVER_FLAG_INVALID (1 << 0)
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_key_types.h
View File

@ -15,10 +15,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct Ipo;
@ -147,7 +143,3 @@ enum {
#define KEYELEM_ELEM_LEN_BEZTRIPLE 4
#define KEYELEM_FLOAT_LEN_BEZTRIPLE (KEYELEM_ELEM_LEN_BEZTRIPLE * KEYELEM_ELEM_SIZE_CURVE)
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_lattice_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_ID.h"
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct BPoint;
struct Ipo;
@ -82,7 +78,3 @@ enum {
};
#define LT_ACTBP_NONE -1
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_layer_types.h
View File

@ -13,10 +13,6 @@
#include "BLI_utildefines.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Render-passes for EEVEE.
* #ViewLayerEEVEE.render_passes
@ -278,7 +274,3 @@ enum {
VIEW_LAYER_FREESTYLE = (1 << 2),
VIEW_LAYER_OUT_OF_SYNC = (1 << 3),
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_light_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_ID.h"
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef MAX_MTEX
# define MAX_MTEX 18
#endif
@ -162,7 +158,3 @@ enum {
LA_AREA_DISK = 4,
LA_AREA_ELLIPSE = 5,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_lightprobe_types.h
View File

@ -14,10 +14,6 @@
#include "BLI_assert.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct Object;
@ -370,7 +366,3 @@ enum {
};
/** \} */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_linestyle_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_ID.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef MAX_MTEX
# define MAX_MTEX 18
#endif
@ -681,7 +677,3 @@ typedef struct FreestyleLineStyle {
ListBase thickness_modifiers;
ListBase geometry_modifiers;
} FreestyleLineStyle;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_listBase.h
View File

@ -12,10 +12,6 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
/** Generic - all structs which are put into linked lists begin with this. */
typedef struct Link {
struct Link *next, *prev;
@ -33,7 +29,3 @@ typedef struct ListBase {
} ListBase;
/* 8 byte alignment! */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_mask_types.h
View File

@ -16,10 +16,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct Mask {
ID id;
struct AnimData *adt;
@ -261,7 +257,3 @@ enum {
enum {
MASK_ANIMF_EXPAND = (1 << 4),
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_material_types.h
View File

@ -12,10 +12,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef MAX_MTEX
# define MAX_MTEX 18
#endif
@ -382,7 +378,3 @@ enum {
GP_MATERIAL_FOLLOW_OBJ = 1,
GP_MATERIAL_FOLLOW_FIXED = 2,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_mesh_types.h
View File

@ -39,10 +39,6 @@ using MeshRuntimeHandle = blender::bke::MeshRuntime;
typedef struct MeshRuntimeHandle MeshRuntimeHandle;
#endif
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct Ipo;
struct Key;
@ -469,7 +465,3 @@ typedef enum eMeshSymmetryType {
} eMeshSymmetryType;
#define MESH_MAX_VERTS 2000000000L
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_meshdata_types.h
View File

@ -10,10 +10,6 @@
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/* -------------------------------------------------------------------- */
/** \name Ordered Selection Storage
* \{ */
@ -497,7 +493,3 @@ typedef struct MRecast {
#endif
/** \} */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_meta_types.h
View File

@ -12,10 +12,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct BoundBox;
struct Ipo;
@ -134,7 +130,3 @@ enum {
MB_HIDE = 1 << 3,
MB_SCALE_RAD = 1 << 4,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_modifier_types.h
View File

@ -26,10 +26,6 @@ using NodesModifierRuntimeHandle = blender::NodesModifierRuntime;
typedef struct NodesModifierRuntimeHandle NodesModifierRuntimeHandle;
#endif
#ifdef __cplusplus
extern "C" {
#endif
/* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE!
* (ONLY ADD NEW ITEMS AT THE END)
*/
@ -2422,7 +2418,3 @@ typedef enum VolumeToMeshResolutionMode {
typedef enum VolumeToMeshFlag {
VOLUME_TO_MESH_USE_SMOOTH_SHADE = 1 << 0,
} VolumeToMeshFlag;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_movieclip_types.h
View File

@ -12,10 +12,6 @@
#include "DNA_color_types.h" /* for color management */
#include "DNA_tracking_types.h" /* for #MovieTracking */
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct ImBuf;
struct MovieClipProxy;
@ -187,7 +183,3 @@ enum {
/** Use original, if proxy is not found. */
MCLIP_PROXY_RENDER_USE_FALLBACK_RENDER = 2,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_nla_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct Ipo;
struct Object;
struct bAction;
@ -98,7 +94,3 @@ typedef enum eActStrip_Flag {
ACTSTRIP_REVERSE = (1 << 7),
ACTSTRIP_AUTO_BLENDS = (1 << 11),
} eActStrip_Flag;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_node_tree_interface_types.h
View File

@ -19,10 +19,6 @@
# include <memory>
#endif
#ifdef __cplusplus
extern "C" {
#endif
struct bContext;
struct bNodeSocket;
struct bNodeSocketType;
@ -406,7 +402,3 @@ typedef struct bNodeTreeInterface {
#endif
} bNodeTreeInterface;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_object_enums.h
View File

@ -10,10 +10,6 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
/** #Object.mode */
typedef enum eObjectMode {
OB_MODE_OBJECT = 0,
@ -66,7 +62,3 @@ typedef enum eDrawType {
OB_MODE_PAINT_GPENCIL_LEGACY | OB_MODE_EDIT_GPENCIL_LEGACY | OB_MODE_SCULPT_GPENCIL_LEGACY | \
OB_MODE_WEIGHT_GPENCIL_LEGACY | OB_MODE_VERTEX_GPENCIL_LEGACY | OB_MODE_SCULPT_CURVES | \
OB_MODE_PAINT_GREASE_PENCIL)
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_object_fluidsim_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_ID.h"
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
struct Ipo;
typedef struct FluidVertexVelocity {
@ -142,7 +138,3 @@ enum {
OB_FLUIDSIM_ACTIVE = 1 << 1,
OB_FLUIDSIM_OVERRIDE_TIME = 1 << 2,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_object_force_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct BodySpring;
/** #PartDeflect.forcefield: Effector Fields types. */
@ -407,7 +403,3 @@ enum {
SBC_MODE_MAX = 3,
SBC_MODE_AVGMINMAX = 4,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_object_types.h
View File

@ -33,10 +33,6 @@ using GeometrySetHandle = blender::bke::GeometrySet;
typedef struct GeometrySetHandle GeometrySetHandle;
#endif
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct BoundBox;
struct Collection;
@ -879,7 +875,3 @@ typedef enum ObjectModifierFlag {
} ObjectModifierFlag;
#define MAX_DUPLI_RECUR 8
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_outliner_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
struct ID;
typedef struct TreeStoreElem {
@ -135,7 +131,3 @@ typedef enum eTreeStoreElemType {
TSE_ID_BASE, \
TSE_GP_LAYER, \
TSE_GENERIC_LABEL))
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_packedFile_types.h
View File

@ -8,16 +8,8 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
typedef struct PackedFile {
int size;
int seek;
void *data;
} PackedFile;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_particle_types.h
View File

@ -12,10 +12,6 @@
#include "DNA_boid_types.h"
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
typedef struct HairKey {
@ -749,7 +745,3 @@ typedef enum eParticleTextureInfluence {
PAMAP_CHILD = (PAMAP_CLUMP | PAMAP_KINK_FREQ | PAMAP_KINK_AMP | PAMAP_ROUGH | PAMAP_LENGTH |
PAMAP_TWIST),
} eParticleTextureInfluence;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_pointcache_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Point cache file data types:
* - Used as `(1 << flag)` so poke jahka if you reach the limit of 15.
@ -158,7 +154,3 @@ enum {
PTCACHE_COMPRESS_LZO = 1,
PTCACHE_COMPRESS_LZMA = 2,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_pointcloud_types.h
View File

@ -33,10 +33,6 @@ using PointCloudRuntimeHandle = blender::bke::PointCloudRuntime;
typedef struct PointCloudRuntimeHandle PointCloudRuntimeHandle;
#endif
#ifdef __cplusplus
extern "C" {
#endif
typedef struct PointCloud {
ID id;
struct AnimData *adt; /* animation data (must be immediately after id) */
@ -82,7 +78,3 @@ enum {
/* Only one material supported currently. */
#define POINTCLOUD_MATERIAL_NR 1
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_rigidbody_types.h
View File

@ -12,10 +12,6 @@
#include "DNA_listBase.h"
#include "DNA_object_force_types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct Collection;
struct EffectorWeights;
@ -357,7 +353,3 @@ typedef enum eRigidBodyCon_Flag {
} eRigidBodyCon_Flag;
/* ******************************** */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_scene_types.h
View File

@ -28,10 +28,6 @@
#include "DNA_vec_types.h"
#include "DNA_view3d_types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct Brush;
struct Collection;
@ -2881,7 +2877,3 @@ enum {
};
/** \} */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_screen_types.h
View File

@ -17,10 +17,6 @@
#include "DNA_ID.h"
#ifdef __cplusplus
extern "C" {
#endif
struct ARegion;
struct ARegionType;
struct PanelType;
@ -832,7 +828,3 @@ typedef enum AssetShelfSettings_DisplayFlag {
ASSETSHELF_SHOW_NAMES = (1 << 0),
} AssetShelfSettings_DisplayFlag;
ENUM_OPERATORS(AssetShelfSettings_DisplayFlag, ASSETSHELF_SHOW_NAMES);
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_sdna_types.h
View File

@ -7,10 +7,6 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
struct MemArena;
#
@ -107,7 +103,3 @@ typedef struct BHead8 {
uint64_t old;
int SDNAnr, nr;
} BHead8;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_sequence_types.h
View File

@ -21,10 +21,6 @@
#include "DNA_session_uuid_types.h" /* for #SessionUUID */
#include "DNA_vec_types.h" /* for #rctf */
#ifdef __cplusplus
extern "C" {
#endif
struct Ipo;
struct MovieClip;
struct Scene;
@ -861,7 +857,3 @@ typedef enum eSeqChannelFlag {
} eSeqChannelFlag;
/** \} */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_session_uuid_types.h
View File

@ -10,10 +10,6 @@
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Is a structure because of the following considerations:
*
@ -28,7 +24,3 @@ typedef struct SessionUUID {
*/
uint64_t uuid_;
} SessionUUID;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_shader_fx_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
struct DRWShadingGroup;
/* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE!
@ -243,7 +239,3 @@ typedef struct WaveShaderFxData {
char _pad[4];
ShaderFxData_Runtime runtime;
} WaveShaderFxData;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_sound_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_ID.h"
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
struct Ipo;
struct PackedFile;
@ -112,7 +108,3 @@ enum {
SOUND_TAGS_WAVEFORM_NO_RELOAD = 1 << 0,
SOUND_TAGS_WAVEFORM_LOADING = (1 << 6),
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_space_types.h
View File

@ -25,10 +25,6 @@
#include "DNA_view2d_types.h"
#include "DNA_viewer_path_types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct BLI_mempool;
struct FileLayout;
struct FileList;
@ -2123,7 +2119,3 @@ typedef enum eSpace_Type {
#define IMG_SIZE_FALLBACK 256
/** \} */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_speaker_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_ID.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct bSound;
@ -51,7 +47,3 @@ enum {
SPK_MUTED = 1 << 1,
// SPK_RELATIVE = 1 << 2, /* UNUSED */
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_text_types.h
View File

@ -13,10 +13,6 @@
#include "DNA_ID.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct TextLine {
struct TextLine *next, *prev;
@ -72,7 +68,3 @@ enum {
/** Use space instead of tabs. */
TXT_TABSTOSPACES = 1 << 10,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_texture_types.h
View File

@ -12,10 +12,6 @@
#include "DNA_defs.h"
#include "DNA_image_types.h" /* ImageUser */
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct ColorBand;
struct CurveMapping;
@ -627,7 +623,3 @@ enum {
};
/** \} */
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_tracking_types.h
View File

@ -13,10 +13,6 @@
#include "DNA_defs.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
/* match-moving data */
struct Image;
@ -625,7 +621,3 @@ enum {
PLANE_TRACK_LOCKED = (1 << 2),
PLANE_TRACK_AUTOKEY = (1 << 3),
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_userdef_enums.h
View File

@ -10,10 +10,6 @@
#include "BLI_utildefines.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* #UserDef.dupflag
*
@ -55,7 +51,3 @@ typedef enum eDupli_ID_Flags {
USER_DUP_LINKED_ID = (1 << 30),
} eDupli_ID_Flags;
ENUM_OPERATORS(eDupli_ID_Flags, USER_DUP_LINKED_ID)
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_userdef_types.h
View File

@ -12,10 +12,6 @@
#include "DNA_texture_types.h" /* ColorBand */
#include "DNA_userdef_enums.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Scaling factor for all UI elements, based on the "Resolution Scale" user preference and the
* DPI/OS Scale of each monitor. This is a read-only, run-time value calculated by
@ -1499,7 +1495,3 @@ enum {
ULANGUAGE_AUTO = 0,
ULANGUAGE_ENGLISH = 1,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_uuid_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* \brief Universally Unique Identifier according to RFC4122.
*
@ -33,7 +29,3 @@ typedef struct bUUID {
* This is 36 characters for the string + a trailing zero byte.
*/
#define UUID_STRING_SIZE 37
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_vec_types.h
View File

@ -8,10 +8,6 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
/* types */
/** vector of two shorts. */
@ -90,7 +86,3 @@ typedef struct DualQuat {
float scale[4][4];
float scale_weight;
} DualQuat;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_vfont_types.h
View File

@ -13,10 +13,6 @@
#include "DNA_ID.h"
#ifdef __cplusplus
extern "C" {
#endif
struct PackedFile;
struct VFontData;
@ -35,7 +31,3 @@ typedef struct VFont {
} VFont;
#define FO_BUILTIN_NAME "<builtin>"
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_view2d_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_vec_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/* ---------------------------------- */
/** View 2D data - stored per region. */
@ -175,7 +171,3 @@ enum {
V2D_ALIGN_NO_POS_Y = (1 << 2),
V2D_ALIGN_NO_NEG_Y = (1 << 3),
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_view3d_enums.h
View File

@ -8,10 +8,6 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
/** Settings for off-screen rendering. */
typedef enum eV3DOffscreenDrawFlag {
V3D_OFSDRAW_NONE = (0),
@ -47,7 +43,3 @@ typedef enum eV3DShadingBackgroundType {
V3D_SHADING_BACKGROUND_WORLD = 1,
V3D_SHADING_BACKGROUND_VIEWPORT = 2,
} eV3DShadingBackgroundType;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_view3d_types.h
View File

@ -24,10 +24,6 @@ struct wmTimer;
#include "DNA_view3d_enums.h"
#include "DNA_viewer_path_types.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct RegionView3D {
/** GL_PROJECTION matrix. */
@ -722,7 +718,3 @@ typedef enum {
/** #BKE_screen_view3d_zoom_to_fac() values above */
#define RV3D_CAMZOOM_MIN_FACTOR 0.1657359312880714853f
#define RV3D_CAMZOOM_MAX_FACTOR 44.9852813742385702928f
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_volume_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_ID.h"
#ifdef __cplusplus
extern "C" {
#endif
struct PackedFile;
struct VolumeGridVector;
@ -164,7 +160,3 @@ typedef enum SliceAxis {
/* Only one material supported currently. */
#define VOLUME_MATERIAL_NR 1
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_windowmanager_types.h
View File

@ -14,10 +14,6 @@
#include "DNA_ID.h"
#ifdef __cplusplus
extern "C" {
#endif
/* Defined here: */
struct wmWindow;
@ -665,7 +661,3 @@ enum {
*/
OP_IS_MODAL_CURSOR_REGION = (1 << 3),
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_workspace_types.h
View File

@ -14,10 +14,6 @@
#include "DNA_asset_types.h"
#include "DNA_viewer_path_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/** #bToolRef_Runtime.flag */
enum {
/**
@ -213,7 +209,3 @@ typedef enum eWorkSpaceFlags {
WORKSPACE_USE_FILTER_BY_ORIGIN = (1 << 1),
WORKSPACE_USE_PIN_SCENE = (1 << 2),
} eWorkSpaceFlags;
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_world_types.h
View File

@ -11,10 +11,6 @@
#include "DNA_ID.h"
#include "DNA_defs.h"
#ifdef __cplusplus
extern "C" {
#endif
struct AnimData;
struct Ipo;
struct LightgroupMembership;
@ -117,7 +113,3 @@ enum {
*/
WO_DS_SHOW_TEXS = 1 << 2,
};
#ifdef __cplusplus
}
#endif

8
source/blender/makesdna/DNA_xr_types.h
View File

@ -10,10 +10,6 @@
#include "DNA_view3d_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/* -------------------------------------------------------------------- */
typedef struct XrSessionSettings {
@ -208,7 +204,3 @@ typedef struct XrActionMap {
} XrActionMap;
/* -------------------------------------------------------------------- */
#ifdef __cplusplus
}
#endif