diff options
author | Andrea Weikert <elubie@gmx.net> | 2009-12-13 20:46:30 +0300 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2009-12-13 20:46:30 +0300 |
commit | ca16488e813ee58491ccca79532a48d098aaacd5 (patch) | |
tree | c911b077702e04ea15fee94f33cedfc0e125f776 /source | |
parent | 3449d3f9b3db78a89ce033f77b38fa6f75e41342 (diff) |
MSVC 9 compile fixes and cleanups
* added renamed files in revision 25337
* renamed BLI_util.h -> BLI_path_util.h for consistency
* cleanup of #includes: removed BLI_blenlib.h in favour of direct includes of the needed headerfiles in a few places.
* removed debug print in sequencer.c
* added missing include in blenkernel/blender.c -> bad dependency, needs to be fixed still
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 13 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_blenlib.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_path_util.h (renamed from source/blender/blenlib/BLI_util.h) | 0 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_bfile.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 7 | ||||
-rw-r--r-- | source/blender/blenlib/intern/scanfill.c | 5 | ||||
-rw-r--r-- | source/blender/blenlib/intern/storage.c | 10 | ||||
-rw-r--r-- | source/blender/blenlib/intern/winstuff.c | 4 | ||||
-rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_interface.c | 2 |
13 files changed, 28 insertions, 25 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index afb1335b86b..6181712f1be 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -94,6 +94,8 @@ #include "BKE_utildefines.h" // O_BINARY FALSE +#include "WM_api.h" // XXXXX BAD, very BAD dependency (bad level call) - remove asap, elubie + Global G; UserDef U; ListBase WMlist= {NULL, NULL}; diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 7450e810b89..2faaa2fb5f5 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -49,14 +49,17 @@ #include "RNA_access.h" #include "RE_pipeline.h" -#include "BLI_blenlib.h" -#include "BLI_util.h" +#include "BLI_fileops.h" +#include "BLI_listbase.h" +#include "BLI_path_util.h" +#include "BLI_string.h" +#include "BLI_threads.h" +#include <pthread.h> #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "BLI_threads.h" -#include <pthread.h> + #include "BKE_context.h" #include "BKE_sound.h" @@ -472,8 +475,6 @@ void calc_sequence_disp(Sequence *seq) void calc_sequence(Sequence *seq) { - printf(" ddd %s\n", seq->name); - Sequence *seqm; int min, max; diff --git a/source/blender/blenlib/BLI_blenlib.h b/source/blender/blenlib/BLI_blenlib.h index cb5f68ed1e0..70f15f0f3af 100644 --- a/source/blender/blenlib/BLI_blenlib.h +++ b/source/blender/blenlib/BLI_blenlib.h @@ -78,7 +78,7 @@ extern "C" { #include "BLI_string.h" -#include "BLI_util.h" +#include "BLI_path_util.h" #include "BLI_storage.h" diff --git a/source/blender/blenlib/BLI_util.h b/source/blender/blenlib/BLI_path_util.h index ca483903d46..ca483903d46 100644 --- a/source/blender/blenlib/BLI_util.h +++ b/source/blender/blenlib/BLI_path_util.h diff --git a/source/blender/blenlib/intern/BLI_bfile.c b/source/blender/blenlib/intern/BLI_bfile.c index d9f6c8ad96f..8e3235bbf23 100644 --- a/source/blender/blenlib/intern/BLI_bfile.c +++ b/source/blender/blenlib/intern/BLI_bfile.c @@ -41,7 +41,7 @@ #include "MEM_guardedalloc.h" #include "BKE_utildefines.h" #include "BKE_blender.h" -#include "BLI_util.h" +#include "BLI_path_util.h" #include "BLI_fileops.h" #include "BLI_storage.h" #include "BLI_bfile.h" diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index bf7a4f77f9e..4f987fcd31e 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -42,12 +42,13 @@ #include "DNA_listBase.h" #include "DNA_userdef_types.h" -#include "BLI_blenlib.h" +#include "BLI_dynamiclist.h" +#include "BLI_fileops.h" +#include "BLI_path_util.h" +#include "BLI_string.h" #include "BLI_storage.h" #include "BLI_storage_types.h" -#include "BLI_dynamiclist.h" -#include "BLI_util.h" #include "BKE_utildefines.h" diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index e54382c9392..32e1c7c810e 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -34,12 +34,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" - -#include "BLI_util.h" #include "DNA_listBase.h" #include "DNA_mesh_types.h" + #include "BLI_editVert.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_scanfill.h" #include "BLI_callbacks.h" diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index dbf1f5100a6..c830e5fc2c8 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -87,13 +87,13 @@ #include "MEM_guardedalloc.h" #include "DNA_listBase.h" -#include "BLI_blenlib.h" -#include "BLI_storage.h" -#include "BLI_storage_types.h" -#include "BLI_util.h" +#include "BLI_listbase.h" #include "BLI_linklist.h" - +#include "BLI_path_util.h" +#include "BLI_storage.h" +#include "BLI_storage_types.h" +#include "BLI_string.h" #include "BKE_utildefines.h" /* vars: */ diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index 16295fc2680..107ece8ebed 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -39,8 +39,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_util.h" +#include "BLI_path_util.h" +#include "BLI_string.h" #define WIN32_SKIP_HKEY_PROTECTION // need to use HKEY #include "BLI_winstuff.h" diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index c3550dfd408..d2543423097 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -21,7 +21,7 @@ extern "C" { #include "BKE_DerivedMesh.h" #include "BKE_fcurve.h" -#include "BLI_util.h" +#include "BLI_path_util.h" #include "BLI_fileops.h" #include "ED_keyframing.h" } diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 9ebcc8b191f..575160ff84e 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -52,7 +52,7 @@ extern "C" #include "BKE_texture.h" #include "BKE_fcurve.h" #include "BKE_depsgraph.h" -#include "BLI_util.h" +#include "BLI_path_util.h" #include "BKE_displist.h" #include "BLI_math.h" #include "BKE_scene.h" diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index a1e70c011fe..06c31e9f1a9 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -44,7 +44,7 @@ #include "BLI_math.h" #include "BLI_listbase.h" #include "BLI_string.h" -#include "BLI_util.h" +#include "BLI_path_util.h" #include "BKE_action.h" #include "BKE_curve.h" diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 7b44f8e6ba1..44e3c5a2dd5 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -54,7 +54,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_util.h" +#include "BLI_path_util.h" #include "BLI_storage.h" #include "BLI_fileops.h" #include "BLI_string.h" |