diff options
8 files changed, 4 insertions, 19 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c4363813e36..9a4a12729a0 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -111,8 +111,6 @@ #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_brush.h" -#include "BKE_cachefile.h" -#include "BKE_cloth.h" #include "BKE_collection.h" #include "BKE_colortools.h" #include "BKE_constraint.h" @@ -120,7 +118,6 @@ #include "BKE_effect.h" #include "BKE_fcurve.h" #include "BKE_global.h" // for G -#include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "BKE_idcode.h" #include "BKE_idprop.h" @@ -137,8 +134,6 @@ #include "BKE_multires.h" #include "BKE_node.h" // for tree type defines #include "BKE_object.h" -#include "BKE_ocean.h" -#include "BKE_outliner_treehash.h" #include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_pointcache.h" diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index ba4dc2d33c7..0a3e592bb15 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -67,7 +67,6 @@ #include "BKE_global.h" // for G #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_mesh.h" // for ME_ defines (patching) #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_particle.h" diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 07900dee0d0..4e0be8ceb9c 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -65,7 +65,10 @@ #include "BKE_text.h" // for txt_extended_ascii_as_utf8 #include "BKE_texture.h" #include "BKE_tracking.h" -#include "BKE_writeffmpeg.h" + +#ifdef WITH_FFMPEG +# include "BKE_writeffmpeg.h" +#endif #include "IMB_imbuf.h" // for proxy / timecode versioning stuff diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index ae355e182e5..38c19fc647a 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -53,10 +53,8 @@ #include "DNA_genfile.h" #include "BKE_animsys.h" -#include "BKE_brush.h" #include "BKE_colortools.h" #include "BKE_fcurve.h" -#include "BKE_gpencil.h" #include "BKE_main.h" #include "BKE_mask.h" #include "BKE_modifier.h" diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 6d21d9c1490..62428690206 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -57,7 +57,6 @@ #include "DNA_text_types.h" #include "DNA_world_types.h" -#include "BKE_action.h" #include "BKE_animsys.h" #include "BKE_cloth.h" #include "BKE_collection.h" @@ -66,22 +65,17 @@ #include "BKE_customdata.h" #include "BKE_fcurve.h" #include "BKE_freestyle.h" -#include "BKE_gpencil.h" #include "BKE_idprop.h" -#include "BKE_image.h" #include "BKE_key.h" #include "BKE_library.h" #include "BKE_layer.h" #include "BKE_main.h" -#include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_node.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pointcache.h" #include "BKE_report.h" #include "BKE_rigidbody.h" -#include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_sequencer.h" #include "BKE_studiolight.h" diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 9b6f252f62d..62bd605a2c2 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -71,14 +71,12 @@ #include "BKE_constraint.h" #include "BKE_deform.h" #include "BKE_fcurve.h" -#include "BKE_image.h" #include "BKE_lattice.h" #include "BKE_main.h" // for Main #include "BKE_mesh.h" // for ME_ defines (patching) #include "BKE_modifier.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_scene.h" #include "BKE_sequencer.h" #include "NOD_socket.h" diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 967820565e7..739dc32d1fe 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -32,7 +32,6 @@ #include "BKE_addon.h" #include "BKE_colorband.h" -#include "BKE_idprop.h" #include "BKE_main.h" #include "BKE_keyconfig.h" diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index d698c94dbfb..f20397617cc 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -157,7 +157,6 @@ #include "BKE_layer.h" #include "BKE_library_override.h" #include "BKE_main.h" -#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_node.h" #include "BKE_pointcache.h" |