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

diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h
index aae2be14f1f55038db70c83b3a9cf4e327d44531..e82eb0ed0c96f3f98926313782fc0df5603a0a35 100644 (file)
--- 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 df0627f61baa0953162c0a7ec26a9af5548e3d50..01d3de1b94fd0897b9e331612516a7baaefaa254 100644 (file)
--- 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 debccaa02f99bf6b4031b20a777a20151336cffe..e25c379ded18438fd73977deb4eb4707fd81a2e6 100644 (file)
--- 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 d4d76b2e6e17b3510d67b1cf7f2c8be43d9178ab..60c2d51571f8dbcce82b228e60dc1a523b42439a 100644 (file)
--- 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 4c7dcff0cd2a31cc8f421c9afa70dce90d9d10bd..292cd95e5724fdb8a9a303dda6afb9018ef04adb 100644 (file)
--- 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 228860c92875bf1cb5098853366720ecdc7dd1e8..41ff3fed8a579f2fdb7694f67c5409703d22171d 100644 (file)
--- 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 c24ec78dc1c97da40ba7d7f206932c65b33bdaa5..89c637d81922dbc2940383ac11e67cfdaed3d2a7 100644 (file)
--- 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 b9b171780c78cd3ca2fa4df75a2c0f504a517ae6..b86be371d666924b4ae76f2b82699f1e559236df 100644 (file)
--- 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 1a1f3a724ca32815f38276eeafbe348848d938f7..7c8cea12549097d148ce2f2906524ac4caf8cbb0 100644 (file)
--- 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 3d7eb1624f362c6f39899922c2eb5fb6f7f78459..d87a49496ec4ff9ce6ff9776add8524b6e5f6a79 100644 (file)
--- 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 1cb28fe56d8f82004b14cb767a1861f2ef037a24..09eac8e2d22e4ca9593781827e025777d31c6442 100644 (file)
--- 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 f991dee19fe37d945f6d0961a67458b66e49a9fc..39b74be3d407838c2457293bd1cbf5efff76ea52 100644 (file)
--- 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 64c9bf4bd072ba818adf28b3ef7d091d5bd82602..a24f37bf73ad0bd35622d090dd7c28ca6930d6bb 100644 (file)
--- 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 5824afd9ded752a7c4df0ebd5ea98ce49c3d24ee..3dea1df2353e633612c28ba142538d633daf0035 100644 (file)
--- 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 6852a487afafe406de09ed1bd320415cb3bd6ca6..e935573cf67a54a94caecf290d335511852e37e7 100644 (file)
--- 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 39e02ee584d7fb67f3adbbae3218daa743006a5a..0f540bfa525da8bf5d50ac7269115588ea4c2348 100644 (file)
--- 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 fcbe8d65d642f8d64df12df50ce307021c7e41d0..b58e6c459ff910397cf12f336a52ea2affaf172f 100644 (file)
--- 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 366d2e37d78a2d4426badaa9506e9bdcfa88dce6..95edfcfe80369f6ee4fccf8f0fed01027947c187 100644 (file)
--- 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 48cef7e1bdebae376e752a90c3715203178953c2..0f44c02d16dcb08870007af7361d5cc6542e8171 100644 (file)
--- 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 aab4e1226b24f945db8d7d7b65490c76913057f4..7f3057bba96963abec9646072c76b36da4ccd0ea 100644 (file)
--- 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 ca39355976bb929c8188ba947f474312f2c469a2..8fd97a801104c62abed80608760387d25c517a3b 100644 (file)
--- 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 5a6ebb187cfc10452e9a84388501c3015a774b38..c8f5eb9b1872dc069b3cbbd4fdff9a746f1c8bcf 100644 (file)
--- 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 6fb1c5ff70c100bf43adf8cb880d78a884d92ad4..1d1b5ec16f7fc330f88d660c447d904b7d243748 100644 (file)
--- 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 fbe710193790c0eff37345b0e80ce4d254489f9e..d1a8de141812f23eeda158b055b791e118c6e8ee 100644 (file)
--- 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 38e9a584952ce854340373f9e6df489bf01c2174..6101012203ada6c62fe92cb1777ea51fad0b1072 100644 (file)
--- 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 1fab3d894fd807aa05b46f5de5a3b73cc073e8b8..9a81974349cf8685e839c725d2320a3514aea772 100644 (file)
--- 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 a2a5ddaf363115fc0df5eff6082df9b349f70fe9..e229de4200649e1f13314d408ab8371d4e8301e3 100644 (file)
--- 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 a9c9830f07f0fc81e904da64de226dcf5d0d8649..f631430b03e435b6ded7db89b3b5d5fe1b423b91 100644 (file)
--- 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 2290909325edf087189c87b18b2b46c637c55696..5c348f16c06966dd7e0c9cdee373fc53e43a12b4 100644 (file)
--- 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 ea20a5c2c885df9f6d15b9a26dcd0b225223c0e2..bd50b52b27d9f92466ac55e15cf25ecfd5c111ed 100644 (file)
--- 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 033c4713e014372b8a051689ea42f16bd0c815b1..690e9dfa8a656b48ce08799ddc853daad5a57494 100644 (file)
--- 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 3b5c07a80017474c2cbd8a7d38037cca2e37ad8b..e8942bcd96394136542a2e419c3c63ae27fc3d44 100644 (file)
--- 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 c2e21755f948ef23b5bee1f03f58b84f653d2b8b..af91823f917b4dc85aa1dbd19b589562c88611d5 100644 (file)
--- 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 a1af68458f6696d3d5699bb3617c581a57070264..2c9ddf3abd8917ea44246bfe9e7ccc486658ccaf 100644 (file)
--- 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 633b0b48a383ce904db69b85f0053bf3cb3dba74..92b52d4b62af3890a0d6c54b5b75e5bfb2664156 100644 (file)
--- 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 c487c0469ba89c55b39a04373a3389d5bfdfdc1d..fb72ec8f3b4b1a7833c698e0c8eb33cd701f703d 100644 (file)
--- 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 b52297a319c5032c21b88356854c6d62c88450fe..abee15990d183de86b5c3e56083e95bbba1a3365 100644 (file)
--- 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 8f83a412c961d112d0dd34ca6c850c24d5f9727f..ee1c7df040913e41773c77327a865f2a483c2b4e 100644 (file)
--- 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 3c22ccdad8fb09939cb0e27232559eff3b5e6788..bd48db2f78080abbc8103e26ff55500bbc00ccaa 100644 (file)
--- 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 463db871f551f4bdd34f28e86e5d1d7a25f21054..ceba2ad3997b785b97610511a6fd36969f1d4ae3 100644 (file)
--- 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 6735d07b5914858b864888ba4b14c0351ad0bae4..2a0fca19be47b6a40c697b73a3eaa854f5d33c3c 100644 (file)
--- 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 8e53e3c6f50a3e4a020b2a5ccb6b6625f56066c4..da637f494dc32d489f3f4a8c969db913b992805c 100644 (file)
--- 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 49395f7fb56361173398a1147bd8fd3a6c454dfb..901bd8ce8fd818cbab74b9db86592278f85d8f38 100644 (file)
--- 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 6d58e7768fc10729e831f882b319cbb1185db718..250f57824b506e33c4e43521a17cc1bb7f1f2bfe 100644 (file)
--- 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 00e2ed7dc62b7afe0199af363a17d2e98a5b8eb7..8c786483d9fee6cf1fbb26dbd5bb3e336fe01ea5 100644 (file)
--- 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 d5d5a7ad002344868541726a5dae56bc3034cccc..06fffa3c757d40e47e7907087beb0441ad88f60c 100644 (file)
--- 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 30b3ddf6e8d47ebfa67c77582aca801248343899..f69f08a16c7ae07eb68cb896a54a6218713e4f21 100644 (file)
--- 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 8832c7c857f450b84d29ed71d13d52e7848457e6..9d14da973d68583349f020e3c4b9fa3acbe2f851 100644 (file)
--- 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 5e360aad9eccf048139ce57032d12e6c2b84d4d5..a1e1d387e4a8dea7300fcea8b4f054a60fe4daa0 100644 (file)
--- 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 a46823a0b28a50051d8615f6ee510df1255243fd..254876d9b68b88b351aecc1d134aaa0c027b72ff 100644 (file)
--- 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 678295376bad895200c0f107d87f9e7d47aa016a..1658f336130747de61800cb0ef6d8910d2a84416 100644 (file)
--- 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 e852afa9a873ead93259bd7aa28599b42c1f1312..3be9c9bf3f7901538e67f87c3626544d13b88638 100644 (file)
--- 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 da6f9fa3f1e04bad973e44fe20addca633c8aeba..715f0a78808707006ef0710d9a4886d8c7f56822 100644 (file)
--- 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 187e21a8702fb09d88675495c120e95dbe8e45fe..e37e8d3d2beed2b5a2a6282e7bbe6674a8bea301 100644 (file)
--- 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 ae2cee64a23990e3d826b000100ac527656da1f3..cdfac81b0fc41c2ce02a702029c65fbeec3ad206 100644 (file)
--- 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 dcd87b89ea09a898dc19fa516daeec29f28bec7b..f4876aba9ad48cdc344348a9d0b64ab6ae449fcb 100644 (file)
--- 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 ad04e28ee4a6e23ee754feb3a156106637487921..c4a8a0309bd0567f4936785d20a70e6ee2846af2 100644 (file)
--- 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 11881ab50d22ca19979db093d90784040d804928..27f45628492d3d602c6c7be39c152aef4d5f802e 100644 (file)
--- 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 a55b2e7743155f2c1a4f7c33245e91e8014f935a..27e9645a4d8ab4b071aaa1c3bfed3779f08f3874 100644 (file)
--- 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 7a3f0ff80e5e7625dc30c604558e98fbed8e1a17..ead25615b4e84eeacf7422e8edfcc9bb5c021b88 100644 (file)
--- 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 1bc51de44712e63e345b218ffd9b622ecde6b53a..a0437625cb2afcca063eb2f448b2aed077881a70 100644 (file)
--- 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 5e0c49e6224df84a483119bd4d64c4f953591ebe..e6f4b2b9f8fd20bdf4fb2383d3a77759a831d4ae 100644 (file)
--- 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 54775affe3f047a8b66dd0f70cf0266937a67362..adbb326902e8037d07ecdfb75df7392685f60eba 100644 (file)
--- 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 79b22f41e30648c5f762642028958cc36aca6d2a..7ff74c82876d1e2873b0fa41c51b96c6191740a6 100644 (file)
--- 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 69375674d94a1d779269dc11656e146cc46b2acb..6395e9e8be884320edeabb176df2f42e56aaf50c 100644 (file)
--- 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 b3763d6cb9070926cdaf2564db9cbb2865a24d40..9beb809e0ddbc13b9ab59d81b59f5640f11a08e4 100644 (file)
--- 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 5e00d17cfab14c4ab6fe41dcd2804807fdfa9eb6..b681f15433cfee601eaf76c1dec6be652df9dea3 100644 (file)
--- 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 e71b9bd66e0e719bcbde8adfe9a8b8f72729611f..aaf69e17f386bfe177b931d887b3d3d67b962860 100644 (file)
--- 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 920c5c12ea1ea9b16432359edde26879b229dcca..1b87a6f4ae7409f1a1585f769330097e4db6d55f 100644 (file)
--- 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 bfa9c0c1e2c3f9e30b152aa9d21ccd05ad02105c..5ad7e1fa061e98436f3b91b6900fbba6ecc151d3 100644 (file)
--- 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 76468ada523c43835abbd88849e9e38133d765df..49c2df428106d9d28663054166d817ccc159cbf2 100644 (file)
--- 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 d0f15b78adae55b3bfd0c3d76922c79dd791d330..f7bbf9235abeea5012e472d90b1135e945682b04 100644 (file)
--- 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 7c9a37072af9a7945d4c51be6f387997fd3726ad..76bb9a5f96f9bd31eb4a25360012b574aaa67592 100644 (file)
--- 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 dc7d105a8de54e860092ac8ed12f6422a42d0e84..814fa25a39042975e86ed3859f9da36c1cff1c17 100644 (file)
--- 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 f310e5e55e0f281c11cde47f790e8f4ac1a19721..dbd9be14c0eb9aed1045d44add1ee2242033365d 100644 (file)
--- 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 2bd95b6f01542c336ba94cc0c8b068d8eecc88d8..273b885f4079487519ddbc4a116593710d15602b 100644 (file)
--- 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 f9e570a39c73fe1b8c9cc41e918106530c3d3020..c348979255ec02bd36ff254ad4c715c17453ad8c 100644 (file)
--- 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 a5299ef081d02137b9191ce68d1cdad795084673..f9d482b2159d5a77565916dfcce4d2147c52f986 100644 (file)
--- 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 45dff0c96fa1bbbe1147141b383ec8c89477319f..c10d306565b350f111ada257d269550eefe9f6e4 100644 (file)
--- 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 ba9d0380c9f39f91f9a0b588843c5819df0c709b..e5308cccdfe1e83028ab80b2511a8e15c503f04c 100644 (file)
--- 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 (file)
index b05ae86..0000000
--- 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 15ac26273af40130e3ed0eeca1b1d0e84ce76524..4133afffeedf55baf3464f3d082955d458cbd328 100644 (file)
--- 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 f33ca10f934ae40ea8135d7fc833d4f01de2598a..077b8ffe1999e57ea94b257c7da9e514e792bff3 100644 (file)
--- 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 db67dba3e265864cf5ae41e27d6597c8564a5ebf..76b22abd78fbd4a18a9d3612af92c3e8443355aa 100644 (file)
--- 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 f0c28cb8aef95e774ada73a1ba8c8ae2701f558f..95516647736548e17ddf4fc943b40b57ee931fe6 100644 (file)
--- 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 505fcdc43d5816e92368d9f18e4ff03da9df2514..66c5f375ba8d26dab3e2cc356a251827bea0c39c 100644 (file)
--- 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 116f5ab22d25301556aa12a8007be6f68e0f4728..4e8e3117b7e6c9340abb21c571a6d2c8847670d7 100644 (file)
--- 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 338454f0e6a11faa8ebaeb651c55d0fc495efa7a..10843cf96771281a1cd0ce53c18c4c2c84895dbf 100644 (file)
--- 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 6f1142ae6b95e622a4b295b48d7a537a26bb0a12..250776664a596bf7f91797353eed8880ec9ca446 100644 (file)
--- 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 e73c3e29f66213adbee7089ce81c1e0f1877c7f5..29ace8055431b52d2bcaee509c2fabba286bb051 100644 (file)
--- 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 f272e7f18a6116c01e153ce413eaeda62d77c24d..c683bee0b3579c3c8a5b5783e09522e58c183d8e 100644 (file)
--- 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 6715e2b78c0c07181a48ee8e7cf334d2a89d5657..2c9ae3115858ee4557f006015f486d641948ce61 100644 (file)
--- 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 c5100578fffa5e1f4fa7c7f5938e3ab112422039..b5e86ac8a575e00cbc782d58e3eacd8039f2ddeb 100644 (file)
--- 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 e7f0495a81700e2909a803d21ee26c50dc292400..15547a1d95e21e6e9e840948ac19c8dbecfd5e9e 100644 (file)
--- 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 9f102fe6c219d373ff84c4ce5aa18f52df4b0d7f..fa1ee7e31595eee444c16bc24ab6b9503b4ef04c 100644 (file)
--- 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 442202655ee38d762960d82ba3fb73875cf0fe4b..06c93eefc59ff6f6a20d98a40784b3351a282845 100644 (file)
--- 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 ab2f892563623aef54b57acfa14425c44b10c5d4..cbd9ae42a26ed4851b74846953b2f31486534c8a 100644 (file)
--- 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 f4561d7cdaeb342bb302b5ba61fa823fb9c35135..0b41267daa96c9c7953167170f5651054b7027d0 100644 (file)
--- 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 79190c409cc59805cbe62eb76445fe4f10f41937..c64fec4075df8daecca5304fa4e285b719ea9f7c 100644 (file)
--- 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 df8372876bdab28f2cd97509bada7a1056ceda5a..25153de7be40af525af1720eb67755c663dfc119 100644 (file)
--- 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 fda3e1c75ef4de288b26358ae27225982468be7e..1a595cbf0519893c01130e2a620b0fc12b59134e 100644 (file)
--- 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 4b55d113536cbe08af2857018c83d2ac5cd6097a..191c702903ab738916372530cc33d055ac3f797b 100644 (file)
--- 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 2ab0a05515681de6cdd3755ee67ce82a3dfe564f..4c3e88d978ed8177c3b3aa041b3bbc729ae66c9e 100644 (file)
--- 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 99bec8159b42738be71bdf507f1d8459d705dbd1..d4936d7054c629eef02b0a3d9f258d7be6c6bda1 100644 (file)
--- 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"