From 708ef646631af236f6a12faa0682f7ad3913d5e0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 4 Aug 2010 04:01:27 +0000 Subject: include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave --- source/blender/blenkernel/BKE_anim.h | 6 +-- source/blender/blenkernel/BKE_displist.h | 2 +- source/blender/blenkernel/BKE_library.h | 2 +- source/blender/blenkernel/BKE_main.h | 1 - source/blender/blenkernel/BKE_node.h | 22 +++++----- source/blender/blenkernel/intern/action.c | 1 + source/blender/blenkernel/intern/anim.c | 2 +- source/blender/blenkernel/intern/armature.c | 1 + source/blender/blenkernel/intern/blender.c | 1 + source/blender/blenkernel/intern/curve.c | 1 + source/blender/blenkernel/intern/displist.c | 3 +- source/blender/blenkernel/intern/font.c | 1 + source/blender/blenkernel/intern/ipo.c | 1 + source/blender/blenkernel/intern/lattice.c | 1 + source/blender/blenkernel/intern/library.c | 45 ++++++++----------- source/blender/blenkernel/intern/object.c | 2 +- source/blender/blenkernel/intern/paint.c | 1 + source/blender/blenkernel/intern/particle_system.c | 1 - source/blender/blenkernel/intern/scene.c | 1 + source/blender/blenkernel/intern/sequencer.c | 1 + source/blender/blenkernel/intern/sound.c | 1 + source/blender/blenkernel/intern/text.c | 4 +- source/blender/blenkernel/intern/world.c | 1 + source/blender/blenlib/intern/bpath.c | 2 + source/blender/blenloader/intern/readblenentry.c | 1 - source/blender/blenloader/intern/readfile.c | 1 - .../blender/editors/animation/anim_channels_edit.c | 1 + source/blender/editors/animation/anim_filter.c | 2 + source/blender/editors/animation/keyframes_draw.c | 1 + source/blender/editors/animation/keyframing.c | 1 + source/blender/editors/animation/keyingsets.c | 1 + source/blender/editors/armature/editarmature.c | 1 + .../editors/armature/editarmature_retarget.c | 1 + .../blender/editors/armature/editarmature_sketch.c | 2 +- source/blender/editors/armature/poseobject.c | 1 + source/blender/editors/gpencil/gpencil_edit.c | 1 + source/blender/editors/gpencil/gpencil_paint.c | 1 + source/blender/editors/object/object_constraint.c | 1 + source/blender/editors/object/object_intern.h | 8 ++-- source/blender/editors/object/object_relations.c | 1 + source/blender/editors/object/object_shapekey.c | 2 +- .../blender/editors/physics/physics_pointcache.c | 1 - source/blender/editors/render/render_preview.c | 1 + source/blender/editors/sculpt_paint/paint_image.c | 1 + source/blender/editors/sculpt_paint/paint_ops.c | 6 +-- source/blender/editors/sculpt_paint/paint_stroke.c | 1 + source/blender/editors/sculpt_paint/paint_utils.c | 1 + source/blender/editors/sculpt_paint/paint_vertex.c | 1 + source/blender/editors/sculpt_paint/sculpt.c | 1 + .../blender/editors/sculpt_paint/sculpt_intern.h | 2 +- source/blender/editors/sound/sound_ops.c | 1 + .../blender/editors/space_action/action_select.c | 3 +- .../editors/space_buttons/buttons_context.c | 3 +- source/blender/editors/space_image/image_draw.c | 1 + source/blender/editors/space_logic/logic_window.c | 13 +++--- source/blender/editors/space_node/node_edit.c | 2 +- source/blender/editors/space_outliner/outliner.c | 1 + .../editors/space_sequencer/sequencer_draw.c | 1 + .../editors/space_sequencer/sequencer_edit.c | 5 ++- source/blender/editors/space_text/text_ops.c | 3 ++ source/blender/editors/space_view3d/drawanimviz.c | 2 +- source/blender/editors/space_view3d/drawarmature.c | 1 + source/blender/editors/space_view3d/drawobject.c | 4 +- source/blender/editors/space_view3d/drawvolume.c | 1 - source/blender/editors/space_view3d/view3d_draw.c | 1 + source/blender/editors/space_view3d/view3d_snap.c | 2 +- source/blender/editors/space_view3d/view3d_view.c | 1 + .../editors/transform/transform_conversions.c | 1 - .../blender/editors/transform/transform_generics.c | 1 - source/blender/editors/transform/transform_snap.c | 1 + source/blender/makesdna/DNA_ID.h | 1 - source/blender/makesdna/DNA_action_types.h | 3 +- source/blender/makesdna/DNA_actuator_types.h | 15 +++++-- source/blender/makesdna/DNA_brush_types.h | 5 ++- source/blender/makesdna/DNA_constraint_types.h | 49 +++++++++++---------- source/blender/makesdna/DNA_object_types.h | 4 +- source/blender/makesdna/DNA_scene_types.h | 6 +-- source/blender/makesdna/DNA_sequence_types.h | 5 +-- source/blender/makesdna/DNA_sound_types.h | 28 ------------ source/blender/makesdna/DNA_space_types.h | 17 ++++++++ source/blender/makesdna/DNA_wave_types.h | 50 ---------------------- source/blender/makesdna/intern/makesdna.c | 2 - source/blender/makesrna/intern/rna_color.c | 1 + source/blender/makesrna/intern/rna_sculpt_paint.c | 1 + source/blender/modifiers/intern/MOD_armature.c | 1 + source/blender/modifiers/intern/MOD_array.c | 1 + source/blender/modifiers/intern/MOD_boolean.c | 1 + source/blender/modifiers/intern/MOD_cast.c | 1 + source/blender/modifiers/intern/MOD_curve.c | 1 + source/blender/modifiers/intern/MOD_displace.c | 1 + source/blender/modifiers/intern/MOD_fluidsim.c | 1 + source/blender/modifiers/intern/MOD_hook.c | 1 + source/blender/modifiers/intern/MOD_lattice.c | 2 + source/blender/modifiers/intern/MOD_mask.c | 1 + source/blender/modifiers/intern/MOD_meshdeform.c | 1 + source/blender/modifiers/intern/MOD_mirror.c | 2 +- source/blender/modifiers/intern/MOD_screw.c | 1 + source/blender/modifiers/intern/MOD_shrinkwrap.c | 2 + source/blender/modifiers/intern/MOD_simpledeform.c | 1 + source/blender/modifiers/intern/MOD_smoke.c | 2 + source/blender/modifiers/intern/MOD_uvproject.c | 1 + source/blender/modifiers/intern/MOD_wave.c | 1 + source/blender/windowmanager/intern/wm_operators.c | 3 +- source/gameengine/Ketsji/KX_Scene.cpp | 1 - 104 files changed, 203 insertions(+), 204 deletions(-) delete mode 100644 source/blender/makesdna/DNA_wave_types.h (limited to 'source') diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h index aae2be14f1f..e82eb0ed0c9 100644 --- a/source/blender/blenkernel/BKE_anim.h +++ b/source/blender/blenkernel/BKE_anim.h @@ -31,8 +31,6 @@ #ifndef BKE_ANIM_H #define BKE_ANIM_H -#define MAX_DUPLI_RECUR 8 - struct Path; struct Object; struct PartEff; @@ -42,8 +40,6 @@ struct bAnimVizSettings; struct bMotionPath; struct bPoseChannel; -#include "DNA_object_types.h" - /* ---------------------------------------------------- */ /* Animation Visualisation */ @@ -54,7 +50,7 @@ void animviz_free_motionpath(struct bMotionPath *mpath); struct bMotionPath *animviz_verify_motionpaths(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan); -void animviz_get_object_motionpaths(Object *ob, ListBase *targets); +void animviz_get_object_motionpaths(struct Object *ob, ListBase *targets); void animviz_calc_motionpaths(struct Scene *scene, ListBase *targets); /* ---------------------------------------------------- */ diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h index df0627f61ba..01d3de1b94f 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -83,7 +83,7 @@ extern void copy_displist(struct ListBase *lbn, struct ListBase *lb); extern void free_disp_elem(DispList *dl); extern DispList *find_displist_create(struct ListBase *lb, int type); extern DispList *find_displist(struct ListBase *lb, int type); -extern void addnormalsDispList(struct Object *ob, struct ListBase *lb); +extern void addnormalsDispList(struct ListBase *lb); extern void count_displist(struct ListBase *lb, int *totvert, int *totface); extern void freedisplist(struct ListBase *lb); extern int displist_has_faces(struct ListBase *lb); diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index debccaa02f9..e25c379ded1 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -55,7 +55,7 @@ int new_id(struct ListBase *lb, struct ID *id, const char *name); struct ListBase *which_libbase(struct Main *mainlib, short type); -#define MAX_LIBARRAY 40 +#define MAX_LIBARRAY 39 int set_listbasepointers(struct Main *main, struct ListBase **lb); void free_libblock(struct ListBase *lb, void *idv); diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index d4d76b2e6e1..60c2d51571f 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -58,7 +58,6 @@ typedef struct Main { ListBase mat; ListBase tex; ListBase image; - ListBase wave; ListBase latt; ListBase lamp; ListBase camera; diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 4c7dcff0cd2..292cd95e572 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -36,24 +36,26 @@ /* not very important, but the stack solver likes to know a maximum */ #define MAX_SOCKET 64 -struct ID; -struct bNodeTree; +struct bContext; struct bNode; struct bNodeLink; struct bNodeSocket; struct bNodeStack; -struct uiLayout; -struct rctf; -struct ListBase; -struct RenderData; -struct Scene; -struct Main; -struct Tex; +struct bNodeTree; struct GPUMaterial; struct GPUNode; struct GPUNodeStack; +struct ID; +struct ListBase; +struct Main; +struct MTex; struct PointerRNA; -struct bContext; +struct rctf; +struct RenderData; +struct Scene; +struct Tex; +struct uiLayout; + /* ************** NODE TYPE DEFINITIONS ***** */ diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 228860c9287..41ff3fed8a5 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -37,6 +37,7 @@ #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BKE_animsys.h" #include "BKE_action.h" diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index c24ec78dc1c..89c637d8192 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -49,7 +49,7 @@ #include "DNA_scene_types.h" #include "DNA_vfont_types.h" -#include "BKE_anim.h" +//(INCLUDE_LINT)#include "BKE_anim.h" #include "BKE_curve.h" #include "BKE_DerivedMesh.h" #include "BKE_depsgraph.h" diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index b9b171780c7..b86be371d66 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -45,6 +45,7 @@ #include "DNA_meshdata_types.h" #include "DNA_nla_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BKE_animsys.h" #include "BKE_armature.h" diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 1a1f3a724ca..7c8cea12549 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -52,6 +52,7 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_sequence_types.h" +#include "DNA_sound_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 3d7eb1624f3..d87a49496ec 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -45,6 +45,7 @@ #include "DNA_key_types.h" #include "DNA_scene_types.h" #include "DNA_vfont_types.h" +#include "DNA_object_types.h" #include "BKE_animsys.h" #include "BKE_anim.h" diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 1cb28fe56d8..09eac8e2d22 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -39,6 +39,7 @@ #include "DNA_curve_types.h" #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "DNA_material_types.h" #include "BLI_blenlib.h" @@ -153,7 +154,7 @@ void copy_displist(ListBase *lbn, ListBase *lb) } } -void addnormalsDispList(Object *ob, ListBase *lb) +void addnormalsDispList(ListBase *lb) { DispList *dl = NULL; float *vdata, *ndata, nor[3]; diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index f991dee19fe..39b74be3d40 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -46,6 +46,7 @@ #include "DNA_curve_types.h" #include "DNA_vfont_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BKE_utildefines.h" diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 64c9bf4bd07..a24f37bf73a 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -54,6 +54,7 @@ #include "DNA_sequence_types.h" #include "DNA_scene_types.h" #include "DNA_world_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" /* windows needs for M_PI */ #include "BLI_blenlib.h" diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 5824afd9ded..3dea1df2353 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -44,6 +44,7 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "DNA_lattice_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 6852a487afa..e935573cf67 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -43,27 +43,29 @@ #include "MEM_guardedalloc.h" /* all types are needed here, in order to do memory operations */ -#include "DNA_scene_types.h" -#include "DNA_mesh_types.h" -#include "DNA_lattice_types.h" -#include "DNA_meta_types.h" -#include "DNA_material_types.h" -#include "DNA_wave_types.h" -#include "DNA_lamp_types.h" +#include "DNA_anim_types.h" +#include "DNA_armature_types.h" +#include "DNA_brush_types.h" #include "DNA_camera_types.h" +#include "DNA_group_types.h" #include "DNA_ipo_types.h" #include "DNA_key_types.h" -#include "DNA_world_types.h" +#include "DNA_lamp_types.h" +#include "DNA_lattice_types.h" +#include "DNA_material_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meta_types.h" +#include "DNA_nla_types.h" +#include "DNA_node_types.h" +#include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_vfont_types.h" -#include "DNA_text_types.h" #include "DNA_sound_types.h" -#include "DNA_group_types.h" -#include "DNA_armature_types.h" -#include "DNA_node_types.h" -#include "DNA_nla_types.h" +#include "DNA_text_types.h" +#include "DNA_vfont_types.h" #include "DNA_windowmanager_types.h" -#include "DNA_anim_types.h" +#include "DNA_world_types.h" +#include "DNA_gpencil_types.h" + #include "BLI_blenlib.h" #include "BLI_dynstr.h" @@ -174,8 +176,6 @@ int id_make_local(ID *id, int test) return 1; case ID_IM: return 0; /* not implemented */ - case ID_WV: - return 0; /* deprecated */ case ID_LT: if(!test) { make_local_lattice((Lattice*)id); @@ -264,8 +264,6 @@ int id_copy(ID *id, ID **newid, int test) case ID_IM: if(!test) *newid= (ID*)copy_image((Image*)id); return 1; - case ID_WV: - return 0; /* deprecated */ case ID_LT: if(!test) *newid= (ID*)copy_lattice((Lattice*)id); return 1; @@ -374,8 +372,6 @@ ListBase *which_libbase(Main *mainlib, short type) return &(mainlib->tex); case ID_IM: return &(mainlib->image); - case ID_WV: - return &(mainlib->wave); case ID_LT: return &(mainlib->latt); case ID_LA: @@ -475,7 +471,6 @@ int set_listbasepointers(Main *main, ListBase **lb) lb[a++]= &(main->curve); lb[a++]= &(main->mball); - lb[a++]= &(main->wave); lb[a++]= &(main->latt); lb[a++]= &(main->lamp); lb[a++]= &(main->camera); @@ -542,9 +537,6 @@ static ID *alloc_libblock_notest(short type) case ID_IM: id= MEM_callocN(sizeof(Image), "image"); break; - case ID_WV: - id= MEM_callocN(sizeof(Wave), "wave"); - break; case ID_LT: id= MEM_callocN(sizeof(Lattice), "latt"); break; @@ -746,9 +738,6 @@ void free_libblock(ListBase *lb, void *idv) case ID_IM: free_image((Image *)id); break; - case ID_WV: - /* free_wave(id); */ - break; case ID_LT: free_lattice((Lattice *)id); break; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 39e02ee584d..0f540bfa525 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -283,7 +283,7 @@ void free_object(Object *ob) ob->path= 0; if(ob->adt) BKE_free_animdata((ID *)ob); if(ob->poselib) ob->poselib->id.us--; - if(ob->gpd) ob->gpd->id.us--; + if(ob->gpd) ((ID *)ob->gpd)->us--; if(ob->defbase.first) BLI_freelistN(&ob->defbase); if(ob->pose) diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index fcbe8d65d64..b58e6c459ff 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -30,6 +30,7 @@ #include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_scene_types.h" +#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_library.h" diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 366d2e37d78..95edfcfe803 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -62,7 +62,6 @@ #include "BLI_listbase.h" #include "BLI_threads.h" -#include "BKE_anim.h" #include "BKE_animsys.h" #include "BKE_boids.h" #include "BKE_cdderivedmesh.h" diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 48cef7e1bde..0f44c02d16d 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -42,6 +42,7 @@ #include "DNA_anim_types.h" #include "DNA_group_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_sequence_types.h" diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index aab4e1226b2..7f3057bba96 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -39,6 +39,7 @@ #include "DNA_scene_types.h" #include "DNA_anim_types.h" #include "DNA_object_types.h" +#include "DNA_sound_types.h" #include "BKE_animsys.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index ca39355976b..8fd97a80110 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -16,6 +16,7 @@ #include "DNA_sequence_types.h" #include "DNA_packedFile_types.h" #include "DNA_screen_types.h" +#include "DNA_sound_types.h" #include "AUD_C-API.h" diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 5a6ebb187cf..c8f5eb9b187 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -43,6 +43,8 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_text_types.h" +#include "DNA_userdef_types.h" +#include "DNA_object_types.h" #include "BKE_depsgraph.h" #include "BKE_global.h" @@ -479,7 +481,7 @@ void unlink_text(Main *bmain, Text *text) for(scene=bmain->scene.first; scene; scene=scene->id.next) if(scene->r.dometext == text) scene->r.dometext = NULL; - + for(ob=bmain->object.first; ob; ob=ob->id.next) { /* game controllers */ for(cont=ob->controllers.first; cont; cont=cont->next) { diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 6fb1c5ff70c..1d1b5ec16f7 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -36,6 +36,7 @@ #include "DNA_world_types.h" #include "DNA_scene_types.h" +#include "DNA_texture_types.h" #include "BKE_library.h" #include "BKE_animsys.h" diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c index fbe71019379..d1a8de14181 100644 --- a/source/blender/blenlib/intern/bpath.c +++ b/source/blender/blenlib/intern/bpath.c @@ -43,6 +43,8 @@ #include "DNA_mesh_types.h" #include "DNA_scene_types.h" /* to get the current frame */ +#include "DNA_image_types.h" +#include "DNA_sound_types.h" #include "DNA_sequence_types.h" #include "DNA_vfont_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 38e9a584952..6101012203a 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -107,7 +107,6 @@ static IDType idtypes[]= { { ID_VF, "VFont", "fonts", IDTYPE_FLAGS_ISLINKABLE}, { ID_WO, "World", "worlds", IDTYPE_FLAGS_ISLINKABLE}, { ID_WM, "WindowManager", "window_managers", 0}, - { ID_WV, "Wave", "waves", 0}, /* deprecated */ }; static int nidtypes= sizeof(idtypes)/sizeof(idtypes[0]); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 1fab3d894fd..9a81974349c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9289,7 +9289,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) idproperties_fix_group_lengths(main->mat); idproperties_fix_group_lengths(main->tex); idproperties_fix_group_lengths(main->image); - idproperties_fix_group_lengths(main->wave); idproperties_fix_group_lengths(main->latt); idproperties_fix_group_lengths(main->lamp); idproperties_fix_group_lengths(main->camera); diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index a2a5ddaf363..e229de42006 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -33,6 +33,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_key_types.h" +#include "DNA_gpencil_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index a9c9830f07f..f631430b03e 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -64,6 +64,8 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_world_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_object_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 2290909325e..5c348f16c06 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -53,6 +53,7 @@ #include "DNA_node_types.h" #include "DNA_particle_types.h" #include "DNA_world_types.h" +#include "DNA_gpencil_types.h" #include "BKE_action.h" #include "BKE_depsgraph.h" diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index ea20a5c2c88..bd50b52b27d 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -45,6 +45,7 @@ #include "DNA_key_types.h" #include "DNA_material_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BKE_animsys.h" #include "BKE_action.h" diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 033c4713e01..690e9dfa8a6 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -42,6 +42,7 @@ #include "DNA_anim_types.h" #include "DNA_constraint_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BKE_main.h" #include "BKE_animsys.h" diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 3b5c07a8001..e8942bcd963 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -60,6 +60,7 @@ #include "BKE_subsurf.h" #include "BKE_utildefines.h" #include "BKE_modifier.h" +#include "DNA_object_types.h" #include "BIF_gl.h" #include "BIF_generate.h" diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index c2e21755f94..af91823f917 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -36,6 +36,7 @@ #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index a1af68458f6..2c9ddf3abd8 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -26,6 +26,7 @@ #include "MEM_guardedalloc.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_armature_types.h" @@ -41,7 +42,6 @@ #include "BKE_global.h" #include "BKE_DerivedMesh.h" #include "BKE_object.h" -#include "BKE_anim.h" #include "BKE_context.h" #include "BKE_sketch.h" diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 633b0b48a38..92b52d4b62a 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -41,6 +41,7 @@ #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BKE_anim.h" #include "BKE_idprop.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index c487c0469ba..fb72ec8f3b4 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -45,6 +45,7 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" +#include "DNA_gpencil_types.h" #include "BKE_armature.h" #include "BKE_blender.h" diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index b52297a319c..abee15990d1 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -44,6 +44,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_gpencil_types.h" #include "UI_view2d.h" diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 8f83a412c96..ee1c7df0409 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -40,6 +40,7 @@ #include "DNA_curve_types.h" #include "DNA_scene_types.h" #include "DNA_text_types.h" +#include "DNA_object_types.h" #include "BKE_action.h" #include "BKE_armature.h" diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 3c22ccdad8f..bd48db2f780 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -131,10 +131,10 @@ void OBJECT_OT_hook_reset(struct wmOperatorType *ot); void OBJECT_OT_hook_recenter(struct wmOperatorType *ot); /* object_lattice.c */ -void free_editLatt(Object *ob); -void make_editLatt(Object *obedit); -void load_editLatt(Object *obedit); -void remake_editLatt(Object *obedit); +void free_editLatt(struct Object *ob); +void make_editLatt(struct Object *obedit); +void load_editLatt(struct Object *obedit); +void remake_editLatt(struct Object *obedit); void LATTICE_OT_select_all(struct wmOperatorType *ot); void LATTICE_OT_make_regular(struct wmOperatorType *ot); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 463db871f55..ceba2ad3997 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -41,6 +41,7 @@ #include "DNA_particle_types.h" #include "DNA_scene_types.h" #include "DNA_world_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" #include "BLI_editVert.h" diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 6735d07b591..2a0fca19be4 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -45,9 +45,9 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BKE_action.h" -#include "BKE_anim.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_depsgraph.h" diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 8e53e3c6f50..da637f494dc 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -33,7 +33,6 @@ #include "DNA_scene_types.h" -#include "BKE_anim.h" #include "BKE_context.h" #include "BKE_particle.h" #include "BKE_report.h" diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 49395f7fb56..901bd8ce8fd 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -54,6 +54,7 @@ #include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "DNA_scene_types.h" +#include "DNA_brush_types.h" #include "DNA_screen_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 6d58e7768fc..250f57824b5 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -54,6 +54,7 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_brush_types.h" #include "BKE_context.h" #include "BKE_idprop.h" diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 00e2ed7dc62..8c786483d9f 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -46,7 +46,7 @@ static int brush_add_exec(bContext *C, wmOperator *op) { /*int type = RNA_enum_get(op->ptr, "type");*/ Paint *paint = paint_get_active(CTX_data_scene(C)); - Brush *br = paint_brush(paint); + struct Brush *br = paint_brush(paint); if (br) br = copy_brush(br); @@ -76,7 +76,7 @@ void BRUSH_OT_add(wmOperatorType *ot) static int brush_scale_size_exec(bContext *C, wmOperator *op) { Paint *paint= paint_get_active(CTX_data_scene(C)); - Brush *brush= paint_brush(paint); + struct Brush *brush= paint_brush(paint); // Object *ob= CTX_data_active_object(C); float scalar= RNA_float_get(op->ptr, "scalar"); @@ -157,7 +157,7 @@ void PAINT_OT_vertex_color_set(wmOperatorType *ot) static int brush_reset_exec(bContext *C, wmOperator *op) { Paint *paint = paint_get_active(CTX_data_scene(C)); - Brush *brush = paint_brush(paint); + struct Brush *brush = paint_brush(paint); Object *ob = CTX_data_active_object(C); if(!ob) return OPERATOR_CANCELLED; diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index d5d5a7ad002..06fffa3c757 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -30,6 +30,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_brush_types.h" #include "RNA_access.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 30b3ddf6e8d..f69f08a16c7 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -7,6 +7,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_brush_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 8832c7c857f..9d14da973d6 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -48,6 +48,7 @@ #include "DNA_armature_types.h" #include "DNA_mesh_types.h" #include "DNA_particle_types.h" +#include "DNA_brush_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 5e360aad9ec..a1e1d387e4a 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -46,6 +46,7 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_cdderivedmesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index a46823a0b28..254876d9b68 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -111,6 +111,6 @@ struct MultiresModifierData *sculpt_multires_active(struct Scene *scene, struct int sculpt_modifiers_active(Scene *scene, Object *ob); void sculpt_vertcos_to_key(Object *ob, KeyBlock *kb, float (*vertCos)[3]); -void brush_jitter_pos(Brush *brush, float *pos, float *jitterpos); +void brush_jitter_pos(struct Brush *brush, float *pos, float *jitterpos); #endif diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 678295376ba..1658f336130 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -36,6 +36,7 @@ #include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_sequence_types.h" +#include "DNA_sound_types.h" #include "DNA_userdef_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index e852afa9a87..3be9c9bf3f7 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -65,6 +65,7 @@ #include "action_intern.h" + /* ************************************************************************** */ /* KEYFRAMES STUFF */ @@ -994,7 +995,7 @@ static void mouse_action_keys (bAnimContext *ac, int mval[2], short select_mode, return; } else if (ale->type == ANIMTYPE_GPLAYER) { - bGPDlayer *gpl= (bGPDlayer *)ale->data; + struct bGPDlayer *gpl= (struct bGPDlayer *)ale->data; gpl_to_keylist(ads, gpl, &anim_keys, NULL); } diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index da6f9fa3f1e..715f0a78808 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -36,6 +36,7 @@ #include "DNA_node_types.h" #include "DNA_scene_types.h" #include "DNA_world_types.h" +#include "DNA_brush_types.h" #include "BLI_listbase.h" @@ -342,7 +343,7 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path) br= paint_brush(paint_get_active(scene)); if(br) { - RNA_id_pointer_create(&br->id, &path->ptr[path->len]); + RNA_id_pointer_create((ID *)br, &path->ptr[path->len]); path->len++; return 1; diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 187e21a8702..e37e8d3d2be 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -36,6 +36,7 @@ #include "DNA_space_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" +#include "DNA_brush_types.h" #include "PIL_time.h" #include "BLI_threads.h" diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index ae2cee64a23..cdfac81b0fc 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -40,6 +40,7 @@ #include "DNA_sensor_types.h" #include "DNA_constraint_types.h" #include "DNA_windowmanager_types.h" +#include "DNA_object_types.h" #include "MEM_guardedalloc.h" @@ -556,7 +557,7 @@ void do_logic_buts(bContext *C, void *arg, int event) bSoundActuator *sa= act->data; if(sa->sndnr) { - bSound *sound= bmain->sound.first; + ID *sound= bmain->sound.first; int nr= 1; if(sa->sndnr == -2) { @@ -570,16 +571,16 @@ void do_logic_buts(bContext *C, void *arg, int event) if(nr==sa->sndnr) break; nr++; - sound= sound->id.next; + sound= sound->next; } if(sa->sound) - sa->sound->id.us--; + ((ID *)sa->sound)->us--; - sa->sound= sound; + sa->sound= (struct bSound *)sound; if(sound) - sound->id.us++; + sound->us++; sa->sndnr= 0; didit= 1; @@ -2153,7 +2154,7 @@ static short draw_actuatorbuttons(Main *bmain, Object *ob, bActuator *act, uiBlo if(sa->sound) { char dummy_str[] = "Sound mode %t|Play Stop %x0|Play End %x1|Loop Stop %x2|Loop End %x3|Loop Ping Pong Stop %x5|Loop Ping Pong %x4"; - uiDefBut(block, TEX, B_IDNAME, "SO:",xco+30,yco-22,wval-20,19, sa->sound->id.name+2, 0.0, 21.0, 0, 0, ""); + uiDefBut(block, TEX, B_IDNAME, "SO:",xco+30,yco-22,wval-20,19, ((ID *)sa->sound)->name+2, 0.0, 21.0, 0, 0, ""); uiDefButS(block, MENU, 1, dummy_str,xco+10,yco-44,width-20, 19, &sa->type, 0.0, 0.0, 0, 0, ""); uiDefButF(block, NUM, 0, "Volume:", xco+10,yco-66,wval, 19, &sa->volume, 0.0, 1.0, 0, 0, "Sets the volume of this sound"); uiDefButF(block, NUM, 0, "Pitch:",xco+wval+10,yco-66,wval, 19, &sa->pitch,-12.0, 12.0, 0, 0, "Sets the pitch of this sound"); diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index dcd87b89ea0..f4876aba9ad 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -411,7 +411,7 @@ void snode_set_context(SpaceNode *snode, Scene *scene) snode->id= &tx->id; } else { - Brush *brush= NULL; + struct Brush *brush= NULL; if(ob && (ob->mode & OB_MODE_SCULPT)) brush= paint_brush(&scene->toolsettings->sculpt->paint); diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index ad04e28ee4a..c4a8a0309bd 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -48,6 +48,7 @@ #include "DNA_scene_types.h" #include "DNA_world_types.h" #include "DNA_sequence_types.h" +#include "DNA_object_types.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 11881ab50d2..27f45628492 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -39,6 +39,7 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_userdef_types.h" +#include "DNA_sound_types.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index a55b2e77431..27e9645a4d8 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -725,8 +725,9 @@ static void recurs_del_seq_flag(Scene *scene, ListBase *lb, short flag, short de while(seq) { seqn= seq->next; if((seq->flag & flag) || deleteall) { - if(seq->type==SEQ_SOUND && seq->sound) - seq->sound->id.us--; + if(seq->type==SEQ_SOUND && seq->sound) { + ((ID *)seq->sound)->us--; /* TODO, could be moved into seq_free_sequence() */ + } BLI_remlink(lb, seq); if(seq==last_seq) seq_active_set(scene, NULL); diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 7a3f0ff80e5..ead25615b4e 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -36,6 +36,7 @@ #include "DNA_constraint_types.h" #include "DNA_text_types.h" +#include "DNA_userdef_types.h" #include "BLI_blenlib.h" #include "PIL_time.h" @@ -591,6 +592,7 @@ void TEXT_OT_run_script(wmOperatorType *ot) static int refresh_pyconstraints_exec(bContext *C, wmOperator *op) { #ifndef DISABLE_PYTHON +#if 0 Text *text= CTX_data_edit_text(C); Object *ob; bConstraint *con; @@ -624,6 +626,7 @@ static int refresh_pyconstraints_exec(bContext *C, wmOperator *op) DAG_id_flush_update(&ob->id, OB_RECALC_DATA); } } +#endif #endif return OPERATOR_FINISHED; diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index 1bc51de4471..a0437625cb2 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -38,12 +38,12 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_view3d_types.h" +#include "DNA_object_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_dlrbTree.h" -#include "BKE_anim.h" #include "BKE_animsys.h" #include "BKE_action.h" #include "BKE_armature.h" diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 5e0c49e6224..e6f4b2b9f8f 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -39,6 +39,7 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_view3d_types.h" +#include "DNA_object_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 54775affe3f..adbb326902e 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3107,7 +3107,7 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas dl= lb->first; if(dl==NULL) return 1; - if(dl->nors==0) addnormalsDispList(ob, lb); + if(dl->nors==0) addnormalsDispList(lb); index3_nors_incr= 0; if( displist_has_faces(lb)==0) { @@ -3154,7 +3154,7 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas dl= lb->first; if(dl==NULL) return 1; - if(dl->nors==NULL) addnormalsDispList(ob, lb); + if(dl->nors==NULL) addnormalsDispList(lb); if(draw_glsl_material(scene, ob, v3d, dt)) { GPU_begin_object_materials(v3d, rv3d, scene, ob, 1, NULL); diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 79b22f41e30..7ff74c82876 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -45,7 +45,6 @@ #include "BLI_edgehash.h" #include "BLI_rand.h" -#include "BKE_anim.h" //for the where_on_path function #include "BKE_curve.h" #include "BKE_constraint.h" // for the get_constraint_target function #include "BKE_DerivedMesh.h" diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 69375674d94..6395e9e8be8 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -33,6 +33,7 @@ #include "DNA_armature_types.h" #include "DNA_camera_types.h" #include "DNA_customdata_types.h" +#include "DNA_object_types.h" #include "DNA_group_types.h" #include "DNA_key_types.h" #include "DNA_lamp_types.h" diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index b3763d6cb90..9beb809e0dd 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -37,6 +37,7 @@ #include "DNA_lattice_types.h" #include "DNA_meta_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -44,7 +45,6 @@ #include "BLI_linklist.h" #include "BKE_action.h" -#include "BKE_anim.h" #include "BKE_armature.h" #include "BKE_context.h" #include "BKE_curve.h" diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 5e00d17cfab..b681f15433c 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -35,6 +35,7 @@ #include "DNA_camera_types.h" #include "DNA_lamp_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index e71b9bd66e0..aaf69e17f38 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -48,7 +48,6 @@ #include "DNA_view3d_types.h" #include "DNA_constraint_types.h" -#include "BKE_anim.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_blender.h" diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 920c5c12ea1..1b87a6f4ae7 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -55,7 +55,6 @@ #include "BKE_animsys.h" #include "BKE_action.h" -#include "BKE_anim.h" #include "BKE_armature.h" #include "BKE_cloth.h" #include "BKE_curve.h" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index bfa9c0c1e2c..5ad7e1fa061 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -36,6 +36,7 @@ #include "DNA_armature_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "DNA_meshdata_types.h" // Temporary, for snapping to other unselected meshes #include "DNA_space_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 76468ada523..49c2df42810 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -164,7 +164,6 @@ typedef struct PreviewImage { #define ID_MA MAKE_ID2('M', 'A') /* Material */ #define ID_TE MAKE_ID2('T', 'E') /* Texture */ #define ID_IM MAKE_ID2('I', 'M') /* Image */ -#define ID_WV MAKE_ID2('W', 'V') /* Wave (unused) */ #define ID_LT MAKE_ID2('L', 'T') /* Lattice */ #define ID_LA MAKE_ID2('L', 'A') /* Lamp */ #define ID_CA MAKE_ID2('C', 'A') /* Camera */ diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index d0f15b78ada..f7bbf9235ab 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -33,9 +33,8 @@ #include "DNA_listBase.h" #include "DNA_ID.h" -#include "DNA_gpencil_types.h" #include "DNA_view2d_types.h" -#include "DNA_userdef_types.h" +#include "DNA_userdef_types.h" /* ThemeWireColor */ struct SpaceLink; struct Object; diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 7c9a37072af..76bb9a5f96f 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -37,9 +37,6 @@ struct Scene; struct Group; struct Text; -// for Sound3D -#include "DNA_sound_types.h" - /* ****************** ACTUATORS ********************* */ /* unused now, moved to editobjectactuator in 2.02. Still needed for dna */ @@ -61,6 +58,18 @@ typedef struct bActionActuator { float stridelength; /* Displacement incurred by cycle */ // not in use } bActionActuator; +typedef struct Sound3D +{ + float min_gain; + float max_gain; + float reference_distance; + float max_distance; + float rolloff_factor; + float cone_inner_angle; + float cone_outer_angle; + float cone_outer_gain; +} Sound3D; + typedef struct bSoundActuator { short flag, sndnr; int pad1, pad2; diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index dc7d105a8de..814fa25a390 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -31,7 +31,7 @@ #define DNA_BRUSH_TYPES_H #include "DNA_ID.h" -#include "DNA_texture_types.h" +#include "DNA_texture_types.h" /* for MTex */ //#ifndef MAX_MTEX // XXX Not used? //#define MAX_MTEX 18 @@ -94,6 +94,9 @@ typedef struct Brush { float add_col[3]; float sub_col[3]; + + int use_flag; /* set the different object modes this brush should be shown in */ + int pad4; } Brush; /* Brush.flag */ diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index f310e5e55e0..dbd9be14c0e 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -33,7 +33,6 @@ #include "DNA_ID.h" #include "DNA_listBase.h" -#include "DNA_object_types.h" struct Action; struct Text; @@ -82,7 +81,7 @@ typedef struct bConstraint { typedef struct bConstraintTarget { struct bConstraintTarget *next, *prev; - Object *tar; /* object to use as target */ + struct Object *tar; /* object to use as target */ char subtarget[32]; /* subtarget - pchan or vgroup name */ float matrix[4][4]; /* matrix used during constraint solving - should be cleared before each use */ @@ -118,7 +117,7 @@ typedef struct bPythonConstraint { ListBase targets; /* a list of targets that this constraint has (bConstraintTarget-s) */ - Object *tar; /* target from previous implementation (version-patch sets this to NULL on file-load) */ + struct Object *tar; /* target from previous implementation (version-patch sets this to NULL on file-load) */ char subtarget[32]; /* subtarger from previous implentation (version-patch sets this to "" on file-load) */ } bPythonConstraint; @@ -130,13 +129,13 @@ typedef struct bPythonConstraint { This is indicated in the comments for each field */ typedef struct bKinematicConstraint { - Object *tar; /* All: target object in case constraint needs a target */ + struct Object *tar; /* All: target object in case constraint needs a target */ short iterations; /* All: Maximum number of iterations to try */ short flag; /* All & CopyPose: some options Like CONSTRAINT_IK_TIP */ short rootbone; /* All: index to rootbone, if zero go all the way to mother bone */ short max_rootbone; /* CopyPose: for auto-ik, maximum length of chain */ char subtarget[32]; /* All: String to specify sub-object target */ - Object *poletar; /* All: Pole vector target */ + struct Object *poletar; /* All: Pole vector target */ char polesubtarget[32]; /* All: Pole vector sub-object target */ float poleangle; /* All: Pole vector rest angle */ float weight; /* All: Weight of constraint in IK tree */ @@ -160,7 +159,7 @@ typedef enum B_CONSTRAINT_IK_TYPE { */ typedef struct bSplineIKConstraint { /* target(s) */ - Object *tar; /* curve object (with follow path enabled) which drives the bone chain */ + struct Object *tar; /* curve object (with follow path enabled) which drives the bone chain */ /* binding details */ float *points; /* array of numpoints items, denoting parametric positions along curve that joints should follow */ @@ -177,7 +176,7 @@ typedef struct bSplineIKConstraint { /* Track To Constraint */ typedef struct bTrackToConstraint { - Object *tar; + struct Object *tar; int reserved1; /* I'll be using reserved1 and reserved2 as Track and Up flags, not sure if that's what they were intented for anyway. Not sure either if it would create backward incompatibility if I were to rename them. - theeth*/ int reserved2; int flags; @@ -187,7 +186,7 @@ typedef struct bTrackToConstraint { /* Copy Rotation Constraint */ typedef struct bRotateLikeConstraint { - Object *tar; + struct Object *tar; int flag; int reserved1; char subtarget[32]; @@ -195,7 +194,7 @@ typedef struct bRotateLikeConstraint { /* Copy Location Constraint */ typedef struct bLocateLikeConstraint { - Object *tar; + struct Object *tar; int flag; int reserved1; char subtarget[32]; @@ -203,7 +202,7 @@ typedef struct bLocateLikeConstraint { /* Copy Scale Constraint */ typedef struct bSizeLikeConstraint { - Object *tar; + struct Object *tar; int flag; int reserved1; char subtarget[32]; @@ -217,13 +216,13 @@ typedef struct bSameVolumeConstraint { /* Copy Transform Constraint */ typedef struct bTransLikeConstraint { - Object *tar; + struct Object *tar; char subtarget[32]; } bTransLikeConstraint; /* Floor Constraint */ typedef struct bMinMaxConstraint { - Object *tar; + struct Object *tar; int minmaxflag; float offset; int flag; @@ -234,7 +233,7 @@ typedef struct bMinMaxConstraint { /* Action Constraint */ typedef struct bActionConstraint { - Object *tar; + struct Object *tar; short type; /* what transform 'channel' drives the result */ short local; /* was used in versions prior to the Constraints recode */ int start; @@ -248,7 +247,7 @@ typedef struct bActionConstraint { /* Locked Axis Tracking constraint */ typedef struct bLockTrackConstraint { - Object *tar; + struct Object *tar; int trackflag; int lockflag; char subtarget[32]; @@ -256,7 +255,7 @@ typedef struct bLockTrackConstraint { /* Damped Tracking constraint */ typedef struct bDampTrackConstraint { - Object *tar; + struct Object *tar; int trackflag; int pad; char subtarget[32]; @@ -264,7 +263,7 @@ typedef struct bDampTrackConstraint { /* Follow Path constraints */ typedef struct bFollowPathConstraint { - Object *tar; /* Must be path object */ + struct Object *tar; /* Must be path object */ float offset; /* Offset in time on the path (in frames), when NOT using 'fixed position' */ float offset_fac; /* Parametric offset factor defining position along path, when using 'fixed position' */ @@ -277,7 +276,7 @@ typedef struct bFollowPathConstraint { /* Stretch to constraint */ typedef struct bStretchToConstraint { - Object *tar; + struct Object *tar; int volmode; int plane; float orglength; @@ -287,8 +286,8 @@ typedef struct bStretchToConstraint { /* Rigid Body constraint */ typedef struct bRigidBodyJointConstraint { - Object *tar; - Object *child; + struct Object *tar; + struct Object *child; int type; float pivX; float pivY; @@ -307,14 +306,14 @@ typedef struct bRigidBodyJointConstraint { /* Clamp-To Constraint */ typedef struct bClampToConstraint { - Object *tar; /* 'target' must be a curve */ + struct Object *tar; /* 'target' must be a curve */ int flag; /* which axis/plane to compare owner's location on */ int flag2; /* for legacy reasons, this is flag2. used for any extra settings */ } bClampToConstraint; /* Child Of Constraint */ typedef struct bChildOfConstraint { - Object *tar; /* object which will act as parent (or target comes from) */ + struct Object *tar; /* object which will act as parent (or target comes from) */ int flag; /* settings */ int pad; float invmat[4][4]; /* parent-inverse matrix to use */ @@ -323,7 +322,7 @@ typedef struct bChildOfConstraint { /* Generic Transform->Transform Constraint */ typedef struct bTransformConstraint { - Object *tar; /* target (i.e. 'driver' object/bone) */ + struct Object *tar; /* target (i.e. 'driver' object/bone) */ char subtarget[32]; short from, to; /* can be loc(0) , rot(1), or size(2) */ @@ -342,7 +341,7 @@ typedef struct bPivotConstraint { /* Pivot Point: * Either target object + offset, or just offset is used */ - Object *tar; /* target object (optional) */ + struct Object *tar; /* target object (optional) */ char subtarget[32]; /* subtarget name (optional) */ float offset[3]; /* offset from the target to use, regardless of whether it exists */ @@ -385,7 +384,7 @@ typedef struct bSizeLimitConstraint { /* Limit Distance Constraint */ typedef struct bDistLimitConstraint { - Object *tar; + struct Object *tar; char subtarget[32]; float dist; /* distance (radius of clamping sphere) from target */ @@ -398,7 +397,7 @@ typedef struct bDistLimitConstraint { /* ShrinkWrap Constraint */ typedef struct bShrinkwrapConstraint { - Object *target; + struct Object *target; float dist; /* distance to kept from target */ short shrinkType; /* shrink type (look on MOD shrinkwrap for values) */ char projAxis; /* axis to project over UP_X, UP_Y, UP_Z */ diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 2bd95b6f015..273b885f407 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -35,7 +35,7 @@ #include "DNA_listBase.h" #include "DNA_ID.h" -#include "DNA_action_types.h" +#include "DNA_action_types.h" /* bAnimVizSettings */ #ifdef __cplusplus extern "C" { @@ -556,6 +556,8 @@ typedef enum ObjectMode { OB_MODE_POSE = 64 } ObjectMode; +#define MAX_DUPLI_RECUR 8 + #ifdef __cplusplus } #endif diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f9e570a39c7..c348979255e 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -36,12 +36,12 @@ extern "C" { #endif -#include "DNA_brush_types.h" #include "DNA_vec_types.h" #include "DNA_listBase.h" #include "DNA_ID.h" struct Object; +struct Brush; struct World; struct Scene; struct Image; @@ -345,7 +345,7 @@ typedef struct RenderData { short bake_normal_space, bake_quad_split; float bake_maxdist, bake_biasdist, bake_pad; - /* paths to backbufffer, output, ftype */ + /* paths to backbufffer, output */ char backbuf[160], pic[160]; /* stamps flags. */ @@ -508,7 +508,7 @@ typedef struct TimeMarker { typedef struct Paint { /* Array of brushes selected for use in this paint mode */ - Brush **brushes; + struct Brush **brushes; int active_brush_index, brush_count; /* WM Paint cursor */ diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index a5299ef081d..f9d482b2159 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -32,12 +32,11 @@ #define DNA_SEQUENCE_TYPES_H #include "DNA_listBase.h" - -/* needed for sound support */ -#include "DNA_sound_types.h" +#include "DNA_vec_types.h" struct Ipo; struct Scene; +struct bSound; /* strlens; 80= FILE_MAXFILE, 160= FILE_MAXDIR */ diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 45dff0c96fa..c10d306565b 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -41,18 +41,6 @@ struct Ipo; struct PackedFile; struct SpaceLink; -typedef struct Sound3D -{ - float min_gain; - float max_gain; - float reference_distance; - float max_distance; - float rolloff_factor; - float cone_inner_angle; - float cone_outer_angle; - float cone_outer_gain; -} Sound3D; - typedef struct bSound { ID id; @@ -115,22 +103,6 @@ typedef enum eSound_Type { #define SND_DRAWFRAMES 1 #define SND_CFRA_NUM 2 -typedef struct SpaceSound { - struct SpaceLink *next, *prev; - ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale; - struct ScrArea *area; - - View2D v2d; - - bSound *sound; - short mode, sndnr; - short xof, yof; - short flag, lock; - int pad2; -} SpaceSound; - #define SOUND_FLAGS_3D (1 << 3) /* to DNA_sound_types.h*/ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index ba9d0380c9f..e5308cccdfe 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -42,6 +42,7 @@ struct ID; struct Text; struct Script; +struct bSound; struct ImBuf; struct Image; struct Scopes; @@ -550,6 +551,22 @@ typedef struct SpaceUserPref { } SpaceUserPref; +typedef struct SpaceSound { + struct SpaceLink *next, *prev; + ListBase regionbase; /* storage of regions for inactive spaces */ + int spacetype; + float blockscale; + struct ScrArea *area; + + View2D v2d; + + struct bSound *sound; + short mode, sndnr; + short xof, yof; + short flag, lock; + int pad2; +} SpaceSound; + /* view3d Now in DNA_view3d_types.h */ diff --git a/source/blender/makesdna/DNA_wave_types.h b/source/blender/makesdna/DNA_wave_types.h deleted file mode 100644 index b05ae862108..00000000000 --- a/source/blender/makesdna/DNA_wave_types.h +++ /dev/null @@ -1,50 +0,0 @@ -/** - * blenlib/DNA_wave_types.h (mar-2001 nzc) - * - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ -#ifndef DNA_WAVE_TYPES_H -#define DNA_WAVE_TYPES_H - -#include "DNA_ID.h" - -struct Ipo; - - -/* a Wave has never been implemented... it was meant as a 'free' mathematical - deformation object type (ton) */ - -typedef struct Wave { - ID id; - - struct Ipo *ipo; - -} Wave; - -#endif - diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 15ac26273af..4133afffeed 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -78,7 +78,6 @@ char *includefiles[] = { "DNA_image_types.h", "DNA_texture_types.h", "DNA_lamp_types.h", - "DNA_wave_types.h", "DNA_material_types.h", "DNA_vfont_types.h", // if you add files here, please add them at the end @@ -1128,7 +1127,6 @@ int main(int argc, char ** argv) #include "DNA_image_types.h" #include "DNA_texture_types.h" #include "DNA_lamp_types.h" -#include "DNA_wave_types.h" #include "DNA_material_types.h" #include "DNA_vfont_types.h" #include "DNA_meta_types.h" diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index f33ca10f934..077b8ffe199 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -29,6 +29,7 @@ #include "rna_internal.h" #include "DNA_color_types.h" +#include "DNA_texture_types.h" #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index db67dba3e26..76b22abd78f 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -30,6 +30,7 @@ #include "DNA_ID.h" #include "DNA_scene_types.h" +#include "DNA_brush_types.h" #include "BKE_paint.h" diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index f0c28cb8aef..95516647736 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -33,6 +33,7 @@ #include "string.h" #include "DNA_armature_types.h" +#include "DNA_object_types.h" #include "BKE_cdderivedmesh.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 505fcdc43d5..66c5f375ba8 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -34,6 +34,7 @@ #include "DNA_curve_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" #include "BLI_ghash.h" diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 116f5ab22d2..4e8e3117b7e 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -30,6 +30,7 @@ * */ +#include "DNA_object_types.h" #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index 338454f0e6a..10843cf9677 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -31,6 +31,7 @@ */ #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index 6f1142ae6b9..250776664a5 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -33,6 +33,7 @@ #include "string.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BKE_cdderivedmesh.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index e73c3e29f66..29ace805543 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -31,6 +31,7 @@ */ #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index f272e7f18a6..c683bee0b35 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -32,6 +32,7 @@ #include "DNA_scene_types.h" #include "DNA_object_fluidsim.h" +#include "DNA_object_types.h" #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 6715e2b78c0..2c9ae311585 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -32,6 +32,7 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index c5100578fff..b5e86ac8a57 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -32,6 +32,8 @@ #include "string.h" +#include "DNA_object_types.h" + #include "BKE_cdderivedmesh.h" #include "BKE_lattice.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index e7f0495a817..15547a1d95e 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -33,6 +33,7 @@ #include "DNA_armature_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" +#include "DNA_object_types.h" #include "BLI_ghash.h" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 9f102fe6c21..fa1ee7e3159 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -31,6 +31,7 @@ */ #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 442202655ee..06c93eefc59 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -30,8 +30,8 @@ * */ - #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index ab2f8925636..cbd9ae42a26 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -33,6 +33,7 @@ /* Screw modifier: revolves the edges about an axis */ #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index f4561d7cdae..0b41267daa9 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -36,6 +36,8 @@ #include "BKE_modifier.h" #include "BKE_shrinkwrap.h" +#include "DNA_object_types.h" + #include "depsgraph_private.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index 79190c409cc..c64fec4075d 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -31,6 +31,7 @@ */ #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index df8372876bd..25153de7be4 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -34,6 +34,8 @@ #include "MEM_guardedalloc.h" +#include "DNA_object_types.h" + #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" #include "BKE_smoke.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index fda3e1c75ef..1a595cbf051 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -34,6 +34,7 @@ #include "DNA_meshdata_types.h" #include "DNA_camera_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" #include "BLI_uvproject.h" diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index 4b55d113536..191c702903a 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -34,6 +34,7 @@ #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" +#include "DNA_object_types.h" #include "BKE_DerivedMesh.h" #include "BKE_object.h" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 2ab0a055156..4c3e88d978e 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -35,6 +35,7 @@ #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_brush_types.h" #include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" @@ -2612,7 +2613,7 @@ static void wm_radial_control_paint(bContext *C, int x, int y, void *customdata) float r1=0.0f, r2=0.0f, r3=0.0f, angle=0.0f; Paint *paint = paint_get_active(CTX_data_scene(C)); - Brush *brush = paint_brush(paint); + struct Brush *brush = paint_brush(paint); ViewContext vc; diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 99bec8159b4..d4936d7054c 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -68,7 +68,6 @@ #include "SG_Tree.h" #include "DNA_group_types.h" #include "DNA_scene_types.h" -#include "BKE_anim.h" #include "KX_SG_NodeRelationships.h" -- cgit v1.2.3