blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Cleanup: reduce indirect DNA header inclusion 

Remove DNA headers, using forward declarations where possible.

Also removed duplicate header, header including it's self
and unnecessary inclusion of libc system headers from BKE header.
This commit is contained in:
Campbell Barton 2020-12-15 10:47:58 +11:00
parent 15f2f69694
commit 525364be31
113 changed files with 259 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/blenkernel/BKE_boids.h
View File

@ -23,13 +23,16 @@
* \ingroup bke
*/
#include "DNA_boid_types.h"
#include "DNA_particle_types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct BoidSettings;
struct BoidState;
struct Object;
struct ParticleData;
struct ParticleSettings;
struct ParticleSimulationData;
struct RNG;
typedef struct BoidBrainData {
@ -50,13 +53,13 @@ typedef struct BoidBrainData {
void boids_precalc_rules(struct ParticleSettings *part, float cfra);
void boid_brain(BoidBrainData *bbd, int p, struct ParticleData *pa);
void boid_body(BoidBrainData *bbd, struct ParticleData *pa);
void boid_default_settings(BoidSettings *boids);
BoidRule *boid_new_rule(int type);
BoidState *boid_new_state(BoidSettings *boids);
BoidState *boid_duplicate_state(BoidSettings *boids, BoidState *state);
void boid_free_settings(BoidSettings *boids);
BoidSettings *boid_copy_settings(const BoidSettings *boids);
BoidState *boid_get_current_state(BoidSettings *boids);
void boid_default_settings(struct BoidSettings *boids);
struct BoidRule *boid_new_rule(int type);
struct BoidState *boid_new_state(struct BoidSettings *boids);
struct BoidState *boid_duplicate_state(struct BoidSettings *boids, struct BoidState *state);
void boid_free_settings(struct BoidSettings *boids);
struct BoidSettings *boid_copy_settings(const struct BoidSettings *boids);
struct BoidState *boid_get_current_state(struct BoidSettings *boids);
#ifdef __cplusplus
}

22
source/blender/blenkernel/BKE_collision.h
View File

@ -22,23 +22,13 @@
* \ingroup bke
*/
#include <float.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
/* types */
#include "BKE_collision.h"
#include "DNA_cloth_types.h"
#include "BLI_kdopbvh.h"
#ifdef __cplusplus
extern "C" {
#endif
struct Collection;
struct CollisionModifierData;
struct BVHTree;
struct Depsgraph;
struct MVert;
struct MVertTri;
@ -113,11 +103,11 @@ typedef struct FaceCollPair {
// used in modifier.c from collision.c
/////////////////////////////////////////////////
BVHTree *bvhtree_build_from_mvert(const struct MVert *mvert,
const struct MVertTri *tri,
int tri_num,
float epsilon);
void bvhtree_update_from_mvert(BVHTree *bvhtree,
struct BVHTree *bvhtree_build_from_mvert(const struct MVert *mvert,
const struct MVertTri *tri,
int tri_num,
float epsilon);
void bvhtree_update_from_mvert(struct BVHTree *bvhtree,
const struct MVert *mvert,
const struct MVert *mvert_moving,
const struct MVertTri *tri,

2
source/blender/blenkernel/BKE_cryptomatte.h
View File

@ -25,8 +25,6 @@
#include "BLI_sys_types.h"
#include "DNA_layer_types.h"
#ifdef __cplusplus
extern "C" {
#endif

8
source/blender/blenkernel/BKE_curve.h
View File

@ -22,7 +22,9 @@
* \ingroup bke
*/
#include "DNA_scene_types.h"
#include "BLI_sys_types.h"
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
@ -318,8 +320,8 @@ void BKE_curve_deform_coords(const struct Object *ob_curve,
const short flag,
const short defaxis);
void BKE_curve_deform_coords_with_editmesh(const Object *ob_curve,
const Object *ob_target,
void BKE_curve_deform_coords_with_editmesh(const struct Object *ob_curve,
const struct Object *ob_target,
float (*vert_coords)[3],
const int vert_coords_len,
const int defgrp_index,

4
source/blender/blenkernel/BKE_effect.h
View File

@ -22,8 +22,6 @@
* \ingroup bke
*/
#include "DNA_modifier_types.h"
#include "BLI_utildefines.h"
#ifdef __cplusplus
@ -147,7 +145,7 @@ float effector_falloff(struct EffectorCache *eff,
struct EffectorData *efd,
struct EffectedPoint *point,
struct EffectorWeights *weights);
int closest_point_on_surface(SurfaceModifierData *surmd,
int closest_point_on_surface(struct SurfaceModifierData *surmd,
const float co[3],
float surface_co[3],
float surface_nor[3],

37
source/blender/blenkernel/BKE_freestyle.h
View File

@ -23,8 +23,6 @@
* \ingroup bke
*/
#include "DNA_scene_types.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -39,28 +37,31 @@ typedef struct FreestyleModuleSettings FreestyleModuleSettings;
typedef struct FreestyleSettings FreestyleSettings;
/* FreestyleConfig */
void BKE_freestyle_config_init(FreestyleConfig *config);
void BKE_freestyle_config_free(FreestyleConfig *config, const bool do_id_user);
void BKE_freestyle_config_copy(FreestyleConfig *new_config,
const FreestyleConfig *config,
void BKE_freestyle_config_init(struct FreestyleConfig *config);
void BKE_freestyle_config_free(struct FreestyleConfig *config, const bool do_id_user);
void BKE_freestyle_config_copy(struct FreestyleConfig *new_config,
const struct FreestyleConfig *config,
const int flag);
/* FreestyleConfig.modules */
FreestyleModuleConfig *BKE_freestyle_module_add(FreestyleConfig *config);
bool BKE_freestyle_module_delete(FreestyleConfig *config, FreestyleModuleConfig *module_conf);
bool BKE_freestyle_module_move(FreestyleConfig *config,
FreestyleModuleConfig *module_conf,
struct FreestyleModuleConfig *BKE_freestyle_module_add(struct FreestyleConfig *config);
bool BKE_freestyle_module_delete(struct FreestyleConfig *config,
struct FreestyleModuleConfig *module_conf);
bool BKE_freestyle_module_move(struct FreestyleConfig *config,
struct FreestyleModuleConfig *module_conf,
int direction);
/* FreestyleConfig.linesets */
FreestyleLineSet *BKE_freestyle_lineset_add(struct Main *bmain,
FreestyleConfig *config,
const char *name);
bool BKE_freestyle_lineset_delete(FreestyleConfig *config, FreestyleLineSet *lineset);
FreestyleLineSet *BKE_freestyle_lineset_get_active(FreestyleConfig *config);
short BKE_freestyle_lineset_get_active_index(FreestyleConfig *config);
void BKE_freestyle_lineset_set_active_index(FreestyleConfig *config, short index);
void BKE_freestyle_lineset_unique_name(FreestyleConfig *config, FreestyleLineSet *lineset);
struct FreestyleLineSet *BKE_freestyle_lineset_add(struct Main *bmain,
struct FreestyleConfig *config,
const char *name);
bool BKE_freestyle_lineset_delete(struct FreestyleConfig *config,
struct FreestyleLineSet *lineset);
struct FreestyleLineSet *BKE_freestyle_lineset_get_active(struct FreestyleConfig *config);
short BKE_freestyle_lineset_get_active_index(struct FreestyleConfig *config);
void BKE_freestyle_lineset_set_active_index(struct FreestyleConfig *config, short index);
void BKE_freestyle_lineset_unique_name(struct FreestyleConfig *config,
struct FreestyleLineSet *lineset);
#ifdef __cplusplus
}

78
source/blender/blenkernel/BKE_idprop.h
View File

@ -20,8 +20,6 @@
* \ingroup bke
*/
#include "DNA_ID.h"
#include "BLI_compiler_attrs.h"
#ifdef __cplusplus
@ -57,9 +55,9 @@ typedef union IDPropertyTemplate {
/* ----------- Property Array Type ---------- */
IDProperty *IDP_NewIDPArray(const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
IDProperty *IDP_CopyIDPArray(const IDProperty *array, const int flag) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL();
struct IDProperty *IDP_NewIDPArray(const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
struct IDProperty *IDP_CopyIDPArray(const struct IDProperty *array,
const int flag) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
/* shallow copies item */
void IDP_SetIndexArray(struct IDProperty *prop, int index, struct IDProperty *item) ATTR_NONNULL();
@ -74,7 +72,9 @@ void IDP_ResizeArray(struct IDProperty *prop, int newlen);
void IDP_FreeArray(struct IDProperty *prop);
/* ---------- String Type ------------ */
IDProperty *IDP_NewString(const char *st, const char *name, int maxlen) ATTR_WARN_UNUSED_RESULT
struct IDProperty *IDP_NewString(const char *st,
const char *name,
int maxlen) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL(2 /* 'name 'arg */); /* maxlen excludes '\0' */
void IDP_AssignString(struct IDProperty *prop, const char *st, int maxlen)
ATTR_NONNULL(); /* maxlen excludes '\0' */
@ -84,9 +84,9 @@ void IDP_FreeString(struct IDProperty *prop) ATTR_NONNULL();
/*-------- ID Type -------*/
typedef void (*IDPWalkFunc)(void *userData, IDProperty *idp);
typedef void (*IDPWalkFunc)(void *userData, struct IDProperty *idp);
void IDP_AssignID(IDProperty *prop, ID *id, const int flag);
void IDP_AssignID(struct IDProperty *prop, struct ID *id, const int flag);
/*-------- Group Functions -------*/
@ -100,10 +100,10 @@ void IDP_ReplaceInGroup(struct IDProperty *group, struct IDProperty *prop) ATTR_
void IDP_ReplaceInGroup_ex(struct IDProperty *group,
struct IDProperty *prop,
struct IDProperty *prop_exist);
void IDP_MergeGroup(IDProperty *dest, const IDProperty *src, const bool do_overwrite)
void IDP_MergeGroup(struct IDProperty *dest, const struct IDProperty *src, const bool do_overwrite)
ATTR_NONNULL();
void IDP_MergeGroup_ex(IDProperty *dest,
const IDProperty *src,
void IDP_MergeGroup_ex(struct IDProperty *dest,
const struct IDProperty *src,
const bool do_overwrite,
const int flag) ATTR_NONNULL();
bool IDP_AddToGroup(struct IDProperty *group, struct IDProperty *prop) ATTR_NONNULL();
@ -113,11 +113,13 @@ bool IDP_InsertToGroup(struct IDProperty *group,
void IDP_RemoveFromGroup(struct IDProperty *group, struct IDProperty *prop) ATTR_NONNULL();
void IDP_FreeFromGroup(struct IDProperty *group, struct IDProperty *prop) ATTR_NONNULL();
IDProperty *IDP_GetPropertyFromGroup(const struct IDProperty *prop,
const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
IDProperty *IDP_GetPropertyTypeFromGroup(const struct IDProperty *prop,
const char *name,
const char type) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
struct IDProperty *IDP_GetPropertyFromGroup(const struct IDProperty *prop,
const char *name) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL();
struct IDProperty *IDP_GetPropertyTypeFromGroup(const struct IDProperty *prop,
const char *name,
const char type) ATTR_WARN_UNUSED_RESULT
ATTR_NONNULL();
/*-------- Main Functions --------*/
struct IDProperty *IDP_GetProperties(struct ID *id,
@ -127,10 +129,10 @@ struct IDProperty *IDP_CopyProperty(const struct IDProperty *prop) ATTR_WARN_UNU
ATTR_NONNULL();
struct IDProperty *IDP_CopyProperty_ex(const struct IDProperty *prop,
const int flag) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
void IDP_CopyPropertyContent(IDProperty *dst, IDProperty *src) ATTR_NONNULL();
void IDP_CopyPropertyContent(struct IDProperty *dst, struct IDProperty *src) ATTR_NONNULL();
bool IDP_EqualsProperties_ex(IDProperty *prop1,
IDProperty *prop2,
bool IDP_EqualsProperties_ex(struct IDProperty *prop1,
struct IDProperty *prop2,
const bool is_strict) ATTR_WARN_UNUSED_RESULT;
bool IDP_EqualsProperties(struct IDProperty *prop1,
@ -142,12 +144,12 @@ struct IDProperty *IDP_New(const char type,
void IDP_FreePropertyContent_ex(struct IDProperty *prop, const bool do_id_user);
void IDP_FreePropertyContent(struct IDProperty *prop);
void IDP_FreeProperty_ex(IDProperty *prop, const bool do_id_user);
void IDP_FreeProperty_ex(struct IDProperty *prop, const bool do_id_user);
void IDP_FreeProperty(struct IDProperty *prop);
void IDP_ClearProperty(IDProperty *prop);
void IDP_ClearProperty(struct IDProperty *prop);
void IDP_Reset(IDProperty *prop, const IDProperty *reference);
void IDP_Reset(struct IDProperty *prop, const struct IDProperty *reference);
#define IDP_Int(prop) ((prop)->data.val)
#define IDP_Array(prop) ((prop)->data.pointer)
@ -155,29 +157,29 @@ void IDP_Reset(IDProperty *prop, const IDProperty *reference);
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
# define IDP_Float(prop) \
_Generic((prop), \
IDProperty *: (*(float *)&(prop)->data.val), \
const IDProperty *: (*(const float *)&(prop)->data.val))
struct IDProperty *: (*(float *)&(prop)->data.val), \
const struct IDProperty *: (*(const float *)&(prop)->data.val))
# define IDP_Double(prop) \
_Generic((prop), \
IDProperty *: (*(double *)&(prop)->data.val), \
const IDProperty *: (*(const double *)&(prop)->data.val))
struct IDProperty *: (*(double *)&(prop)->data.val), \
const struct IDProperty *: (*(const double *)&(prop)->data.val))
# define IDP_String(prop) \
_Generic((prop), \
IDProperty *: ((char *) (prop)->data.pointer), \
const IDProperty *: ((const char *) (prop)->data.pointer))
struct IDProperty *: ((char *) (prop)->data.pointer), \
const struct IDProperty *: ((const char *) (prop)->data.pointer))
# define IDP_IDPArray(prop) \
_Generic((prop), \
IDProperty *: ((IDProperty *) (prop)->data.pointer), \
const IDProperty *: ((const IDProperty *) (prop)->data.pointer))
struct IDProperty *: ((struct IDProperty *) (prop)->data.pointer), \
const struct IDProperty *: ((const struct IDProperty *) (prop)->data.pointer))
# define IDP_Id(prop) \
_Generic((prop), \
IDProperty *: ((ID *) (prop)->data.pointer), \
const IDProperty *: ((const ID *) (prop)->data.pointer))
struct IDProperty *: ((ID *) (prop)->data.pointer), \
const struct IDProperty *: ((const ID *) (prop)->data.pointer))
#else
# define IDP_Float(prop) (*(float *)&(prop)->data.val)
# define IDP_Double(prop) (*(double *)&(prop)->data.val)
# define IDP_String(prop) ((char *)(prop)->data.pointer)
# define IDP_IDPArray(prop) ((IDProperty *)(prop)->data.pointer)
# define IDP_IDPArray(prop) ((struct IDProperty *)(prop)->data.pointer)
# define IDP_Id(prop) ((ID *)(prop)->data.pointer)
#endif
@ -185,7 +187,7 @@ void IDP_Reset(IDProperty *prop, const IDProperty *reference);
* Call a callback for each idproperty in the hierarchy under given root one (included).
*
*/
typedef void (*IDPForeachPropertyCallback)(IDProperty *id_property, void *user_data);
typedef void (*IDPForeachPropertyCallback)(struct IDProperty *id_property, void *user_data);
void IDP_foreach_property(struct IDProperty *id_property_root,
const int type_filter,
@ -194,18 +196,18 @@ void IDP_foreach_property(struct IDProperty *id_property_root,
/* Format IDProperty as strings */
char *IDP_reprN(const struct IDProperty *prop, uint *r_len);
void IDP_repr_fn(const IDProperty *prop,
void IDP_repr_fn(const struct IDProperty *prop,
void (*str_append_fn)(void *user_data, const char *str, uint str_len),
void *user_data);
void IDP_print(const struct IDProperty *prop);
void IDP_BlendWrite(struct BlendWriter *writer, const struct IDProperty *prop);
void IDP_BlendReadData_impl(struct BlendDataReader *reader,
IDProperty **prop,
struct IDProperty **prop,
const char *caller_func_id);
#define IDP_BlendDataRead(reader, prop) IDP_BlendReadData_impl(reader, prop, __func__)
void IDP_BlendReadLib(struct BlendLibReader *reader, IDProperty *prop);
void IDP_BlendReadExpand(struct BlendExpander *expander, IDProperty *prop);
void IDP_BlendReadLib(struct BlendLibReader *reader, struct IDProperty *prop);
void IDP_BlendReadExpand(struct BlendExpander *expander, struct IDProperty *prop);
#ifdef __cplusplus
}

21
source/blender/blenkernel/BKE_layer.h
View File

@ -23,15 +23,14 @@
#include "BKE_collection.h"
#include "DNA_listBase.h"
#include "DNA_scene_types.h"
#ifdef __cplusplus
extern "C" {
#endif
#define TODO_LAYER_OVERRIDE /* CollectionOverride */
#define TODO_LAYER_OVERRIDE /* CollectionOverride */
#define TODO_LAYER_OPERATORS /* collection mamanger and property panel operators */
#define TODO_LAYER /* generic todo */
#define TODO_LAYER /* generic todo */
struct Base;
struct BlendDataReader;
@ -56,9 +55,9 @@ typedef enum eViewLayerCopyMethod {
struct ViewLayer *BKE_view_layer_default_view(const struct Scene *scene);
struct ViewLayer *BKE_view_layer_default_render(const struct Scene *scene);
struct ViewLayer *BKE_view_layer_find(const struct Scene *scene, const char *layer_name);
struct ViewLayer *BKE_view_layer_add(Scene *scene,
struct ViewLayer *BKE_view_layer_add(struct Scene *scene,
const char *name,
ViewLayer *view_layer_source,
struct ViewLayer *view_layer_source,
const int type);
/* DEPRECATED */
@ -393,10 +392,11 @@ struct ObjectsInModeParams {
void *filter_userdata;
};
Base **BKE_view_layer_array_from_bases_in_mode_params(struct ViewLayer *view_layer,
const struct View3D *v3d,
uint *r_len,
const struct ObjectsInModeParams *params);
struct Base **BKE_view_layer_array_from_bases_in_mode_params(
struct ViewLayer *view_layer,
const struct View3D *v3d,
uint *r_len,
const struct ObjectsInModeParams *params);
struct Object **BKE_view_layer_array_from_objects_in_mode_params(
struct ViewLayer *view_layer,
@ -452,7 +452,8 @@ void BKE_view_layer_verify_aov(struct RenderEngine *engine,
struct Scene *scene,
struct ViewLayer *view_layer);
bool BKE_view_layer_has_valid_aov(struct ViewLayer *view_layer);
ViewLayer *BKE_view_layer_find_with_aov(struct Scene *scene, struct ViewLayerAOV *view_layer_aov);
struct ViewLayer *BKE_view_layer_find_with_aov(struct Scene *scene,
struct ViewLayerAOV *view_layer_aov);
#ifdef __cplusplus
}

5
source/blender/blenkernel/BKE_particle.h
View File

@ -29,11 +29,8 @@
#include "BLI_buffer.h"
#include "BLI_utildefines.h"
#include "DNA_object_types.h"
#include "DNA_particle_types.h"
#include "BKE_customdata.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -302,7 +299,7 @@ int psys_get_tot_child(struct Scene *scene,
struct ParticleSystem *psys_get_current(struct Object *ob);
/* for rna */
short psys_get_current_num(struct Object *ob);
void psys_set_current_num(Object *ob, int index);
void psys_set_current_num(struct Object *ob, int index);
/* UNUSED */
// struct Object *psys_find_object(struct Scene *scene, struct ParticleSystem *psys);

11
source/blender/blenkernel/BKE_pointcache.h
View File

@ -23,12 +23,10 @@
* \ingroup bke
*/
#include "DNA_ID.h"
#include "DNA_boid_types.h"
#include "DNA_dynamicpaint_types.h"
#include "DNA_object_force_types.h"
#include "DNA_pointcache_types.h"
#include <stdio.h> /* for FILE */
#include "DNA_boid_types.h" /* for #BoidData */
#include "DNA_pointcache_types.h" /* for #BPHYS_TOT_DATA */
#include <stdio.h> /* for #FILE */
#ifdef __cplusplus
extern "C" {
@ -93,6 +91,7 @@ struct SoftBody;
struct ViewLayer;
struct BlendWriter;
struct BlendDataReader;
struct DynamicPaintSurface;
/* temp structure for read/write */
typedef struct PTCacheData {

13
source/blender/blenkernel/BKE_sequencer_offscreen.h
View File

@ -23,26 +23,23 @@
* \ingroup bke
*/
#include "DNA_object_enums.h"
#include "DNA_view3d_types.h"
#include "IMB_imbuf_types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct GPUOffScreen;
enum eDrawType;
enum eImBufFlags;
typedef struct ImBuf *(*SequencerDrawView)(struct Depsgraph *depsgraph,
struct Scene *scene,
struct View3DShading *shading_override,
eDrawType drawtype,
enum eDrawType drawtype,
struct Object *camera,
int width,
int height,
eImBufFlags flag,
enum eImBufFlags flag,
eV3DOffscreenDrawFlag draw_flags,
int alpha_mode,
const char *viewname,

1
source/blender/blenkernel/BKE_shader_fx.h
View File

@ -19,7 +19,6 @@
* \ingroup bke
*/
#include "BKE_customdata.h"
#include "BLI_compiler_attrs.h"
#include "DNA_shader_fx_types.h" /* needed for all enum typdefs */

3
source/blender/blenkernel/BKE_simulation.h
View File

@ -16,8 +16,6 @@
#pragma once
#include "DNA_simulation_types.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -25,6 +23,7 @@ extern "C" {
struct Depsgraph;
struct Main;
struct Scene;
struct Simulation;
void *BKE_simulation_add(struct Main *bmain, const char *name);

2
source/blender/blenkernel/BKE_studiolight.h
View File

@ -29,7 +29,7 @@
#include "BLI_path_util.h"
#include "DNA_userdef_types.h"
#include "DNA_userdef_types.h" /* for #SolidLight */
#ifdef __cplusplus
extern "C" {

6
source/blender/blenkernel/BKE_text_suggestions.h
View File

@ -22,8 +22,6 @@
* \ingroup bke
*/
#include "DNA_text_types.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -62,9 +60,9 @@ typedef struct SuggList {
void free_texttools(void);
/* Used to identify which Text object the current tools should appear against */
void texttool_text_set_active(Text *text);
void texttool_text_set_active(struct Text *text);
void texttool_text_clear(void);
short texttool_text_is_active(Text *text);
short texttool_text_is_active(struct Text *text);
/* Suggestions */
void texttool_suggest_add(const char *name, char type);

1
source/blender/blenkernel/intern/anim_data.c
View File

@ -42,6 +42,7 @@
#include "DNA_ID.h"
#include "DNA_anim_types.h"
#include "DNA_light_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
#include "DNA_space_types.h"
#include "DNA_windowmanager_types.h"

1
source/blender/blenkernel/intern/boids.c
View File

@ -39,6 +39,7 @@
#include "BKE_collision.h"
#include "BKE_effect.h"
#include "BKE_particle.h"
#include "BLI_kdopbvh.h"
#include "BKE_modifier.h"

1
source/blender/blenkernel/intern/brush.c
View File

@ -23,6 +23,7 @@
#include "DNA_brush_types.h"
#include "DNA_defaults.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

1
source/blender/blenkernel/intern/dynamicpaint.c
View File

@ -42,6 +42,7 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_texture_types.h"

3
source/blender/blenkernel/intern/gpencil_curve.c
View File

@ -36,8 +36,11 @@
#include "BLT_translation.h"
#include "DNA_collection_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"
#include "BKE_collection.h"
#include "BKE_context.h"

1
source/blender/blenkernel/intern/gpencil_geom.c
View File

@ -42,6 +42,7 @@
#include "DNA_gpencil_modifier_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"

2
source/blender/blenkernel/intern/idprop_utils.c
View File

@ -26,6 +26,8 @@
#include "BLI_string.h"
#include "BLI_utildefines.h"
#include "DNA_ID.h"
#include "BKE_idprop.h"
#include "BKE_idtype.h"

1
source/blender/blenkernel/intern/idtype.c
View File

@ -36,6 +36,7 @@
#include "BLT_translation.h"
#include "DNA_ID.h"
#include "DNA_collection_types.h"
#include "DNA_node_types.h"
#include "DNA_scene_types.h"

1
source/blender/blenkernel/intern/image.c
View File

@ -54,6 +54,7 @@
#include "DNA_camera_types.h"
#include "DNA_defaults.h"
#include "DNA_light_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"

1
source/blender/blenkernel/intern/lib_id.c
View File

@ -37,6 +37,7 @@
/* all types are needed here, in order to do memory operations */
#include "DNA_ID.h"
#include "DNA_anim_types.h"
#include "DNA_collection_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_key_types.h"
#include "DNA_node_types.h"

1
source/blender/blenkernel/intern/lib_remap.c
View File

@ -24,6 +24,7 @@
#include "BLI_utildefines.h"
#include "DNA_collection_types.h"
#include "DNA_object_types.h"
#include "BKE_armature.h"

1
source/blender/blenkernel/intern/modifier.c
View File

@ -38,6 +38,7 @@
#include "DNA_armature_types.h"
#include "DNA_cloth_types.h"
#include "DNA_dynamicpaint_types.h"
#include "DNA_fluid_types.h"
#include "DNA_gpencil_modifier_types.h"
#include "DNA_mesh_types.h"

1
source/blender/blenkernel/intern/node.c
View File

@ -35,6 +35,7 @@
#include "DNA_action_types.h"
#include "DNA_anim_types.h"
#include "DNA_collection_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_light_types.h"
#include "DNA_linestyle_types.h"

1
source/blender/blenkernel/intern/object.c
View File

@ -38,6 +38,7 @@
#include "DNA_collection_types.h"
#include "DNA_constraint_types.h"
#include "DNA_defaults.h"
#include "DNA_dynamicpaint_types.h"
#include "DNA_effect_types.h"
#include "DNA_fluid_types.h"
#include "DNA_gpencil_modifier_types.h"

1
source/blender/blenkernel/intern/object_update.c
View File

@ -28,6 +28,7 @@
#include "DNA_key_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_modifier_types.h"
#include "DNA_scene_types.h"
#include "BLI_blenlib.h"

1
source/blender/blenkernel/intern/particle.c
View File

@ -41,6 +41,7 @@
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_force_types.h"
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"

1
source/blender/blenkernel/intern/particle_child.c
View File

@ -25,6 +25,7 @@
#include "BLI_noise.h"
#include "DNA_material_types.h"
#include "DNA_object_types.h"
#include "BKE_colortools.h"
#include "BKE_particle.h"

1
source/blender/blenkernel/intern/particle_distribute.c
View File

@ -40,6 +40,7 @@
#include "DNA_particle_types.h"
#include "DNA_scene_types.h"
#include "BKE_customdata.h"
#include "BKE_global.h"
#include "BKE_lib_id.h"
#include "BKE_mesh.h"

1
source/blender/blenkernel/intern/particle_system.c
View File

@ -34,6 +34,7 @@
#include "DNA_anim_types.h"
#include "DNA_boid_types.h"
#include "DNA_cloth_types.h"
#include "DNA_curve_types.h"
#include "DNA_listBase.h"
#include "DNA_mesh_types.h"

2
source/blender/blenkernel/intern/scene.c
View File

@ -37,6 +37,7 @@
#include "DNA_gpencil_types.h"
#include "DNA_linestyle_types.h"
#include "DNA_mask_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
@ -47,6 +48,7 @@
#include "DNA_sound_types.h"
#include "DNA_space_types.h"
#include "DNA_text_types.h"
#include "DNA_vfont_types.h"
#include "DNA_view3d_types.h"
#include "DNA_windowmanager_types.h"
#include "DNA_workspace_types.h"

1
source/blender/blenkernel/intern/screen.c
View File

@ -34,6 +34,7 @@
#include "MEM_guardedalloc.h"
#include "DNA_collection_types.h"
#include "DNA_defaults.h"
#include "DNA_gpencil_types.h"
#include "DNA_mask_types.h"

3
source/blender/blenkernel/intern/softbody.c
View File

@ -52,6 +52,7 @@
#include "DNA_lattice_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
@ -149,7 +150,7 @@ typedef struct SB_thread_context {
#define BSF_INTERSECT 1 /* edge intersects collider face */
/* private definitions for bodypoint states */
#define SBF_DOFUZZY 1 /* Bodypoint do fuzzy */
#define SBF_DOFUZZY 1 /* Bodypoint do fuzzy */
#define SBF_OUTOFCOLLISION 2 /* Bodypoint does not collide */
#define BFF_INTERSECT 1 /* collider edge intrudes face */

4
source/blender/blenkernel/particle_private.h
View File

@ -27,6 +27,8 @@
extern "C" {
#endif
struct CurveMapping;
typedef struct ParticleChildModifierContext {
ParticleThreadContext *thread_ctx;
ParticleSimulationData *sim;
@ -62,7 +64,7 @@ float do_clump(ParticleKey *state,
float pa_clump,
bool use_clump_noise,
float clump_noise_size,
CurveMapping *clumpcurve);
struct CurveMapping *clumpcurve);
void do_child_modifiers(const ParticleChildModifierContext *modifier_ctx,
float mat[4][4],
ParticleKey *state,

2
source/blender/blenloader/intern/readfile.c
View File

@ -45,6 +45,7 @@
#include "DNA_anim_types.h"
#include "DNA_cachefile_types.h"
#include "DNA_collection_types.h"
#include "DNA_fileglobal_types.h"
#include "DNA_genfile.h"
#include "DNA_key_types.h"
@ -53,6 +54,7 @@
#include "DNA_packedFile_types.h"
#include "DNA_sdna_types.h"
#include "DNA_sound_types.h"
#include "DNA_vfont_types.h"
#include "DNA_volume_types.h"
#include "DNA_workspace_types.h"

1
source/blender/blenloader/intern/versioning_250.c
View File

@ -46,6 +46,7 @@
#include "DNA_meshdata_types.h"
#include "DNA_node_types.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_screen_types.h"
#include "DNA_sdna_types.h"

2
source/blender/blenloader/intern/versioning_260.c
View File

@ -28,11 +28,13 @@
#include "DNA_camera_types.h"
#include "DNA_cloth_types.h"
#include "DNA_constraint_types.h"
#include "DNA_dynamicpaint_types.h"
#include "DNA_fluid_types.h"
#include "DNA_genfile.h"
#include "DNA_key_types.h"
#include "DNA_light_types.h"
#include "DNA_linestyle_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_fluidsim_types.h"

1
source/blender/blenloader/intern/versioning_270.c
View File

@ -64,6 +64,7 @@
#include "BKE_scene.h"
#include "BKE_screen.h"
#include "BKE_tracking.h"
#include "DNA_material_types.h"
#include "SEQ_sequencer.h"

1
source/blender/blenloader/intern/versioning_290.c
View File

@ -29,6 +29,7 @@
#include "DNA_anim_types.h"
#include "DNA_brush_types.h"
#include "DNA_cachefile_types.h"
#include "DNA_collection_types.h"
#include "DNA_constraint_types.h"
#include "DNA_fluid_types.h"
#include "DNA_genfile.h"

1
source/blender/blenloader/intern/versioning_defaults.c
View File

@ -37,6 +37,7 @@
#include "DNA_curveprofile_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_light_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"

1
source/blender/blenloader/intern/versioning_legacy.c
View File

@ -49,6 +49,7 @@
#include "DNA_nla_types.h"
#include "DNA_node_types.h"
#include "DNA_object_fluidsim_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_screen_types.h"
#include "DNA_sdna_types.h"

1
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -31,6 +31,7 @@
#endif
#include "DNA_anim_types.h"
#include "DNA_collection_types.h"
#include "DNA_curve_types.h"
#include "DNA_scene_types.h"
#include "DNA_space_types.h"

1
source/blender/blenloader/intern/writefile.c
View File

@ -93,6 +93,7 @@
/* allow writefile to use deprecated functionality (for forward compatibility code) */
#define DNA_DEPRECATED_ALLOW
#include "DNA_collection_types.h"
#include "DNA_fileglobal_types.h"
#include "DNA_genfile.h"
#include "DNA_sdna_types.h"

1
source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
View File

@ -34,6 +34,7 @@
#include "BLI_string.h"
#include "BLI_utildefines.h"
#include "DNA_collection_types.h"
#include "DNA_freestyle_types.h"
#include "DNA_layer_types.h"
#include "DNA_linestyle_types.h"

1
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -39,6 +39,7 @@
#include "DNA_armature_types.h"
#include "DNA_cachefile_types.h"
#include "DNA_camera_types.h"
#include "DNA_cloth_types.h"
#include "DNA_collection_types.h"
#include "DNA_constraint_types.h"
#include "DNA_curve_types.h"

1
source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
View File

@ -34,6 +34,7 @@
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
#include "DNA_collection_types.h"
#include "DNA_linestyle_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"

1
source/blender/draw/intern/draw_cache_impl_particles.c
View File

@ -38,6 +38,7 @@
#include "DNA_modifier_types.h"
#include "DNA_particle_types.h"
#include "BKE_customdata.h"
#include "BKE_mesh.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"

2
source/blender/editors/armature/editarmature_undo.c
View File

@ -26,7 +26,9 @@
#include "CLG_log.h"
#include "DNA_armature_types.h"
#include "DNA_layer_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "BLI_array_utils.h"
#include "BLI_listbase.h"

1
source/blender/editors/gpencil/drawgpencil.c
View File

@ -41,6 +41,7 @@
#include "DNA_brush_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"

1
source/blender/editors/gpencil/gpencil_add_monkey.c
View File

@ -25,6 +25,7 @@
#include "BLI_utildefines.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

1
source/blender/editors/gpencil/gpencil_add_stroke.c
View File

@ -25,6 +25,7 @@
#include "BLI_utildefines.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

1
source/blender/editors/gpencil/gpencil_convert.c
View File

@ -41,6 +41,7 @@
#include "DNA_collection_types.h"
#include "DNA_curve_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

1
source/blender/editors/gpencil/gpencil_data.c
View File

@ -42,6 +42,7 @@
#include "DNA_anim_types.h"
#include "DNA_brush_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_types.h"

1
source/blender/editors/gpencil/gpencil_edit.c
View File

@ -41,6 +41,7 @@
#include "DNA_gpencil_modifier_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

1
source/blender/editors/gpencil/gpencil_fill.c
View File

@ -35,6 +35,7 @@
#include "DNA_brush_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_image_types.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_windowmanager_types.h"

1
source/blender/editors/gpencil/gpencil_merge.c
View File

@ -31,6 +31,7 @@
#include "BLI_math.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "BKE_brush.h"
#include "BKE_context.h"

1
source/blender/editors/gpencil/gpencil_ops_versioning.c
View File

@ -33,6 +33,7 @@
#include "BLI_math.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

1
source/blender/editors/gpencil/gpencil_sculpt_paint.c
View File

@ -41,6 +41,7 @@
#include "BLT_translation.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

1
source/blender/editors/gpencil/gpencil_select.c
View File

@ -36,6 +36,7 @@
#include "BLI_utildefines.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"

2
source/blender/editors/gpencil/gpencil_utils.c
View File

@ -40,7 +40,9 @@
#include "PIL_time.h"
#include "DNA_brush_types.h"
#include "DNA_collection_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

1
source/blender/editors/gpencil/gpencil_vertex_ops.c
View File

@ -32,6 +32,7 @@
#include "DNA_brush_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "BKE_colortools.h"
#include "BKE_context.h"

1
source/blender/editors/gpencil/gpencil_vertex_paint.c
View File

@ -31,6 +31,7 @@
#include "DNA_brush_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "BKE_brush.h"
#include "BKE_colortools.h"

8
source/blender/editors/include/ED_info.h
View File

@ -38,8 +38,12 @@ const char *ED_info_statistics_string(struct Main *bmain,
struct Scene *scene,
struct ViewLayer *view_layer);
void ED_info_draw_stats(
struct Main *bmain, Scene *scene, ViewLayer *view_layer, int x, int *y, int height);
void ED_info_draw_stats(struct Main *bmain,
struct Scene *scene,
struct ViewLayer *view_layer,
int x,
int *y,
int height);
#ifdef __cplusplus
}

8
source/blender/editors/include/ED_uvedit.h
View File

@ -217,8 +217,10 @@ struct BMLoop *ED_uvedit_active_vert_loop_get(struct BMesh *bm);
void ED_uvedit_active_edge_loop_set(struct BMesh *bm, struct BMLoop *l);
struct BMLoop *ED_uvedit_active_edge_loop_get(struct BMesh *bm);
char ED_uvedit_select_mode_get(const Scene *scene);
void ED_uvedit_select_sync_flush(const ToolSettings *ts, struct BMEditMesh *em, const bool select);
char ED_uvedit_select_mode_get(const struct Scene *scene);
void ED_uvedit_select_sync_flush(const struct ToolSettings *ts,
struct BMEditMesh *em,
const bool select);
/* uvedit_unwrap_ops.c */
void ED_uvedit_live_unwrap_begin(struct Scene *scene, struct Object *obedit);
@ -244,7 +246,7 @@ struct UVPackIsland_Params {
uint use_seams : 1;
uint correct_aspect : 1;
};
void ED_uvedit_pack_islands_multi(const Scene *scene,
void ED_uvedit_pack_islands_multi(const struct Scene *scene,
Object **objects,
const uint objects_len,
const struct UVPackIsland_Params *params);

1
source/blender/editors/interface/interface_eyedropper_gpencil_color.c
View File

@ -34,6 +34,7 @@
#include "BLT_translation.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_space_types.h"
#include "BKE_context.h"

1
source/blender/editors/mesh/editmesh_select_similar.c
View File

@ -34,6 +34,7 @@
#include "BKE_material.h"
#include "BKE_report.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "WM_api.h"

1
source/blender/editors/mesh/editmesh_undo.c
View File

@ -27,6 +27,7 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "BLI_array_utils.h"
#include "BLI_listbase.h"

2
source/blender/editors/metaball/editmball_undo.c
View File

@ -30,8 +30,10 @@
#include "BLI_utildefines.h"
#include "DNA_defs.h"
#include "DNA_layer_types.h"
#include "DNA_meta_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "BKE_context.h"
#include "BKE_layer.h"

1
source/blender/editors/object/object_bake.c
View File

@ -25,6 +25,7 @@
#include "MEM_guardedalloc.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"

1
source/blender/editors/physics/rigidbody_constraint.c
View File

@ -25,6 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include "DNA_collection_types.h"
#include "DNA_object_types.h"
#include "DNA_rigidbody_types.h"
#include "DNA_scene_types.h"

1
source/blender/editors/physics/rigidbody_object.c
View File

@ -25,6 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include "DNA_collection_types.h"
#include "DNA_object_types.h"
#include "DNA_rigidbody_types.h"
#include "DNA_scene_types.h"

1
source/blender/editors/sculpt_paint/paint_image.c
View File

@ -40,6 +40,7 @@
#include "IMB_imbuf_types.h"
#include "DNA_brush_types.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"

2
source/blender/editors/space_outliner/tree/tree_display_libraries.cc
View File

@ -24,6 +24,8 @@
#include "BKE_collection.h"
#include "BKE_main.h"
#include "DNA_collection_types.h"
#include "BLT_translation.h"
#include "../outliner_intern.h"

1
source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
View File

@ -20,6 +20,7 @@
#include <iostream>
#include "DNA_collection_types.h"
#include "DNA_scene_types.h"
#include "BKE_layer.h"

1
source/blender/editors/undo/memfile_undo.c
View File

@ -27,6 +27,7 @@
#include "BLI_listbase.h"
#include "DNA_ID.h"
#include "DNA_collection_types.h"
#include "DNA_node_types.h"
#include "DNA_object_enums.h"
#include "DNA_object_types.h"

1
source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c
View File

@ -28,6 +28,7 @@
#include "BKE_object.h"
#include "BKE_screen.h"
#include "DNA_material_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_particle_types.h"

1
source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
View File

@ -33,6 +33,7 @@
#include "DNA_gpencil_modifier_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"

1
source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
View File

@ -34,6 +34,7 @@
#include "DNA_defaults.h"
#include "DNA_gpencil_modifier_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"

1
source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
View File

@ -33,6 +33,7 @@
#include "DNA_defaults.h"
#include "DNA_gpencil_modifier_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_types.h"

2
source/blender/imbuf/intern/jpeg.c
View File

@ -33,6 +33,8 @@
#include "BKE_idprop.h"
#include "DNA_ID.h" /* ID property definitions. */
#include "IMB_filetype.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"

2
source/blender/imbuf/intern/metadata.c
View File

@ -29,6 +29,8 @@
#include "BKE_idprop.h"
#include "DNA_ID.h" /* ID property definitions. */
#include "MEM_guardedalloc.h"
#include "IMB_imbuf.h"

2
source/blender/imbuf/intern/png.c
View File

@ -32,6 +32,8 @@
#include "BKE_global.h"
#include "BKE_idprop.h"
#include "DNA_ID.h" /* ID property definitions. */
#include "MEM_guardedalloc.h"
#include "IMB_imbuf.h"

1
source/blender/io/alembic/exporter/abc_writer_hair.cc
View File

@ -30,6 +30,7 @@
#include "BLI_math_geom.h"
#include "BKE_customdata.h"
#include "BKE_mesh.h"
#include "BKE_mesh_runtime.h"
#include "BKE_particle.h"

1
source/blender/io/alembic/intern/alembic_capi.cc
View File

@ -35,6 +35,7 @@
#include "MEM_guardedalloc.h"
#include "DNA_cachefile_types.h"
#include "DNA_collection_types.h"
#include "DNA_curve_types.h"
#include "DNA_modifier_types.h"
#include "DNA_object_types.h"

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

@ -24,8 +24,8 @@
#pragma once
#include "DNA_ID.h"
#include "DNA_color_types.h" /* for color management */
#include "DNA_tracking_types.h"
#include "DNA_color_types.h" /* for color management */
#include "DNA_tracking_types.h" /* for #MovieTracking */
#ifdef __cplusplus
extern "C" {

19
source/blender/makesdna/DNA_node_types.h
View File

@ -25,9 +25,8 @@
#include "DNA_ID.h"
#include "DNA_listBase.h"
#include "DNA_scene_types.h"
#include "DNA_texture_types.h"
#include "DNA_vec_types.h"
#include "DNA_scene_types.h" /* for #ImageFormatData */
#include "DNA_vec_types.h" /* for #rctf */
#ifdef __cplusplus
extern "C" {
@ -352,8 +351,8 @@ typedef struct bNode {
/* XXX NODE_UPDATE is a generic update flag. More fine-grained updates
* might be used in the future, but currently all work the same way.
*/
#define NODE_UPDATE 0xFFFF /* generic update flag (includes all others) */
#define NODE_UPDATE_ID 1 /* associated id data block has changed */
#define NODE_UPDATE 0xFFFF /* generic update flag (includes all others) */
#define NODE_UPDATE_ID 1 /* associated id data block has changed */
#define NODE_UPDATE_OPERATOR 2 /* node update triggered from update operator */
/* Unique hash key for identifying node instances
@ -512,11 +511,11 @@ typedef struct bNodeTree {
#define NTREE_TYPE_INIT 1
/* ntree->flag */
#define NTREE_DS_EXPAND (1 << 0) /* for animation editors */
#define NTREE_COM_OPENCL (1 << 1) /* use opencl */
#define NTREE_TWO_PASS (1 << 2) /* two pass */
#define NTREE_DS_EXPAND (1 << 0) /* for animation editors */
#define NTREE_COM_OPENCL (1 << 1) /* use opencl */
#define NTREE_TWO_PASS (1 << 2) /* two pass */
#define NTREE_COM_GROUPNODE_BUFFER (1 << 3) /* use groupnode buffers */
#define NTREE_VIEWER_BORDER (1 << 4) /* use a border for viewer nodes */
#define NTREE_VIEWER_BORDER (1 << 4) /* use a border for viewer nodes */
/* NOTE: DEPRECATED, use (id->tag & LIB_TAG_LOCALIZED) instead. */
/* tree is localized copy, free when deleting node groups */
@ -1097,7 +1096,7 @@ typedef struct NodeAttributeMix {
#define NODE_IES_EXTERNAL 1
/* frame node flags */
#define NODE_FRAME_SHRINK 1 /* keep the bounding box minimal */
#define NODE_FRAME_SHRINK 1 /* keep the bounding box minimal */
#define NODE_FRAME_RESIZEABLE 2 /* test flag, if frame can be resized by user */
/* proxy node flags */

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

@ -33,15 +33,10 @@
#define USE_SETSCENE_CHECK
#include "DNA_ID.h"
#include "DNA_collection_types.h"
#include "DNA_color_types.h" /* color management */
#include "DNA_curveprofile_types.h"
#include "DNA_color_types.h" /* color management */
#include "DNA_customdata_types.h" /* Scene's runtime cddata masks. */
#include "DNA_freestyle_types.h"
#include "DNA_layer_types.h"
#include "DNA_listBase.h"
#include "DNA_material_types.h"
#include "DNA_userdef_types.h"
#include "DNA_vec_types.h"
#include "DNA_view3d_types.h"
@ -487,7 +482,7 @@ typedef struct ImageFormatData {
#define R_IMF_IMTYPE_INVALID 255
/* ImageFormatData.flag */
#define R_IMF_FLAG_ZBUF (1 << 0) /* was R_OPENEXR_ZBUF */
#define R_IMF_FLAG_ZBUF (1 << 0) /* was R_OPENEXR_ZBUF */
#define R_IMF_FLAG_PREVIEW_JPG (1 << 1) /* was R_PREVIEW_JPG */
/* return values from BKE_imtype_valid_depths, note this is depts per channel */
@ -529,8 +524,8 @@ typedef enum eImageFormatDepth {
/* ImageFormatData.jp2_flag */
#define R_IMF_JP2_FLAG_YCC (1 << 0) /* when disabled use RGB */ /* was R_JPEG2K_YCC */
#define R_IMF_JP2_FLAG_CINE_PRESET (1 << 1) /* was R_JPEG2K_CINE_PRESET */
#define R_IMF_JP2_FLAG_CINE_48 (1 << 2) /* was R_JPEG2K_CINE_48FPS */
#define R_IMF_JP2_FLAG_CINE_PRESET (1 << 1) /* was R_JPEG2K_CINE_PRESET */
#define R_IMF_JP2_FLAG_CINE_48 (1 << 2) /* was R_JPEG2K_CINE_48FPS */
/* ImageFormatData.jp2_codec */
#define R_IMF_JP2_CODEC_JP2 0
@ -1782,7 +1777,7 @@ typedef struct Scene {
ListBase view_layers;
/* Not an actual datablock, but memory owned by scene. */
Collection *master_collection;
struct Collection *master_collection;
struct SceneCollection *collection DNA_DEPRECATED;
/** Settings to be override by workspaces. */
@ -1829,12 +1824,12 @@ typedef struct Scene {
#define R_MODE_UNUSED_20 (1 << 20) /* cleared */
#define R_MODE_UNUSED_21 (1 << 21) /* cleared */
#define R_NO_OVERWRITE (1 << 22) /* skip existing files */
#define R_TOUCH (1 << 23) /* touch files before rendering */
#define R_NO_OVERWRITE (1 << 22) /* skip existing files */
#define R_TOUCH (1 << 23) /* touch files before rendering */
#define R_SIMPLIFY (1 << 24)
#define R_EDGE_FRS (1 << 25) /* R_EDGE reserved for Freestyle */
#define R_EDGE_FRS (1 << 25) /* R_EDGE reserved for Freestyle */
#define R_PERSISTENT_DATA (1 << 26) /* keep data around for re-render */
#define R_MODE_UNUSED_27 (1 << 27) /* cleared */
#define R_MODE_UNUSED_27 (1 << 27) /* cleared */
/** #RenderData.seq_flag */
enum {

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

@ -33,9 +33,8 @@
#include "DNA_color_types.h"
#include "DNA_defs.h"
#include "DNA_listBase.h"
#include "DNA_session_uuid_types.h"
#include "DNA_vec_types.h"
#include "DNA_vfont_types.h"
#include "DNA_session_uuid_types.h" /* for #SessionUUID */
#include "DNA_vec_types.h" /* for #rctf */
#ifdef __cplusplus
extern "C" {
@ -44,6 +43,7 @@ extern "C" {
struct Ipo;
struct MovieClip;
struct Scene;
struct VFont;
struct bSound;
/* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */
@ -338,7 +338,7 @@ typedef struct GaussianBlurVars {
typedef struct TextVars {
char text[512];
VFont *text_font;
struct VFont *text_font;
int text_blf_id;
int text_size;
float color[4], shadow_color[4], box_color[4];

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

@ -24,10 +24,8 @@
#pragma once
#include "DNA_listBase.h"
#include "DNA_screen_types.h"
#include "DNA_userdef_types.h"
#include "DNA_vec_types.h"
#include "DNA_xr_types.h"
#include "DNA_screen_types.h" /* for #ScrAreaMap */
#include "DNA_xr_types.h" /* for #XrSessionSettings */
#include "DNA_ID.h"

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

@ -22,7 +22,7 @@
#pragma once
#include "DNA_scene_types.h"
#include "DNA_ID.h"
#ifdef __cplusplus
extern "C" {

2
source/blender/makesrna/intern/rna_access.c
View File

@ -5808,7 +5808,7 @@ ID *RNA_find_real_ID_and_path(Main *bmain, ID *id, const char **r_path)
if (r_path) {
*r_path = "collection";
}
return (ID *)BKE_collection_master_scene_search(bmain, (Collection *)id);
return (ID *)BKE_collection_master_scene_search(bmain, (struct Collection *)id);
default:
return NULL;

1
source/blender/makesrna/intern/rna_brush.c
View File

@ -22,6 +22,7 @@
#include "DNA_brush_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_material_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_texture_types.h"

1
source/blender/makesrna/intern/rna_object_force.c
View File

@ -21,6 +21,7 @@
#include <stdlib.h>
#include "DNA_cloth_types.h"
#include "DNA_dynamicpaint_types.h"
#include "DNA_fluid_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"

1
source/blender/modifiers/intern/MOD_cloth.c
View File

@ -33,6 +33,7 @@
#include "DNA_defaults.h"
#include "DNA_key_types.h"
#include "DNA_mesh_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"

2
source/blender/modifiers/intern/MOD_collision.c
View File

@ -23,6 +23,7 @@
#include "BLI_utildefines.h"
#include "BLI_kdopbvh.h"
#include "BLI_math.h"
#include "BLT_translation.h"
@ -30,6 +31,7 @@
#include "DNA_defaults.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_object_force_types.h"
#include "DNA_object_types.h"
#include "DNA_screen_types.h"

1
source/blender/modifiers/intern/MOD_nodes.cc
View File

@ -33,6 +33,7 @@
#include "BLI_string.h"
#include "BLI_utildefines.h"
#include "DNA_collection_types.h"
#include "DNA_defaults.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"

Some files were not shown because too many files have changed in this diff Show More