- remove unused includes IMB_*, BIF_* & MEM_*
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Aug 2010 05:46:10 +0000 (05:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Aug 2010 05:46:10 +0000 (05:46 +0000)
- remove MEM_guardedalloc.h from header files (include directly)

139 files changed:
source/blender/avi/intern/avi.c
source/blender/avi/intern/avi_intern.h
source/blender/blenfont/intern/blf_lang.c
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/intern/BME_Customdata.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/booleanops_mesh.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/fmodifier.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/screen.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/world.c
source/blender/blenkernel/intern/writeframeserver.c
source/blender/blenlib/BLI_ghash.h
source/blender/blenlib/intern/pbvh.c
source/blender/blenlib/intern/winstuff.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/armature/armature_ops.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/editarmature_generate.c
source/blender/editors/armature/poseSlide.c
source/blender/editors/armature/poseUtils.c
source/blender/editors/armature/poseobject.c
source/blender/editors/armature/reeb.c
source/blender/editors/curve/curve_ops.c
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/editaction_gpencil.c
source/blender/editors/gpencil/gpencil_buttons.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_anim.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_style.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/view2d.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/loopcut.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_group.c
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_transform.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/render/render_preview.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_action/action_ops.c
source/blender/editors/space_api/space.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_buttons/buttons_header.c
source/blender/editors/space_console/console_draw.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_file/writeimage.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_graph/graph_ops.c
source/blender/editors/space_graph/graph_utils.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_info/info_ops.c
source/blender/editors/space_logic/logic_buttons.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_logic/space_logic.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_nla/nla_ops.c
source/blender/editors/space_node/node_buttons.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_outliner/space_outliner.c
source/blender/editors/space_script/script_edit.c
source/blender/editors/space_script/script_header.c
source/blender/editors/space_script/script_ops.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_ops.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_text/text_header.c
source/blender/editors/space_time/time_ops.c
source/blender/editors/space_userpref/space_userpref.c
source/blender/editors/space_view3d/drawanimviz.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/transform/transform_constraints.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/ikplugin/intern/ikplugin_api.c
source/blender/imbuf/intern/allocimbuf.c
source/blender/imbuf/intern/anim.c
source/blender/imbuf/intern/cache.c
source/blender/imbuf/intern/filter.c
source/blender/imbuf/intern/imbuf.h
source/blender/imbuf/intern/iris.c
source/blender/imbuf/intern/png.c
source/blender/imbuf/intern/rotate.c
source/blender/imbuf/intern/scaling.c
source/blender/imbuf/intern/targa.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/modifiers/intern/MOD_array.c
source/blender/modifiers/intern/MOD_bevel.c
source/blender/modifiers/intern/MOD_boolean_util.c
source/blender/modifiers/intern/MOD_build.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/render/intern/raytrace/bvh.h
source/blender/render/intern/source/pipeline.c
source/gameengine/Converter/BL_ArmatureObject.cpp

index a73dec57a559eb5d98078e6b79410d299b901d09..5f0d36e17e20ac7119d0238b51da039209975ba7 100644 (file)
@@ -38,6 +38,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "AVI_avi.h"
 #include "avi_intern.h"
 
index 1ea304213caabf6d24256e92174c934570003121..20de67530fd2eee2565168056b2f366957a019ca 100644 (file)
@@ -31,8 +31,6 @@
 
 #include <stdio.h> /* for FILE */
 
-#include "MEM_guardedalloc.h"
-
 unsigned int GET_FCC (FILE *fp);
 unsigned int GET_TCC (FILE *fp);
 
index 1baf2c82ef79e6ed4b70ab312ec6a2a4d5e21100..7054d955faf2b62f030d0d6d9fa21b1f152b8e5b 100644 (file)
@@ -34,7 +34,6 @@
 #include <locale.h>
 #include "libintl.h"
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_listBase.h"
 #include "DNA_vec_types.h"
index 6b390b2b0cf202b9f0ce3a933f1d5b833f8a519e..52536e10e565b7d1bf965f54200561601ccf9f62 100644 (file)
@@ -33,8 +33,6 @@
 #include "DNA_object_force.h"
 #include "DNA_boid_types.h"
 
-#include "MEM_guardedalloc.h"
-
 /* Point cache clearing option, for BKE_ptcache_id_clear, before
  * and after are non inclusive (they wont remove the cfra) */
 #define PTCACHE_CLEAR_ALL              0
index d8a6b66d5bb97f4c41f262ff29f50e7e6f43fb41..1087b3a873c762fd9fdb97ce1a4338e42b06dd2e 100644 (file)
@@ -36,9 +36,9 @@
 
 #include <string.h>
 
+#include "MEM_guardedalloc.h"
 #include "BKE_bmeshCustomData.h"
 #include "bmesh_private.h"
-#include "MEM_guardedalloc.h"
 
 /********************* Layer type information **********************/
 typedef struct BME_LayerTypeInfo {
index 89c637d81922dbc2940383ac11e67cfdaed3d2a7..e27e3b2cd3f8c731caf8256e4ed988c5686be61f 100644 (file)
@@ -40,7 +40,6 @@
 #include "BLI_math.h"
 #include "BLI_rand.h"
 
-
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_group_types.h"
@@ -49,7 +48,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_vfont_types.h"
 
-//(INCLUDE_LINT)#include "BKE_anim.h"
 #include "BKE_curve.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_depsgraph.h"
@@ -66,7 +64,6 @@
 #include "BKE_utildefines.h"
 #include "BKE_depsgraph.h"
 
-#include "ED_curve.h" /* for ED_curve_nurbs */
 
 // XXX bad level call...
 
index 431e51cf1497bbf9d9bef5ca2176d7cc5f70d9c2..dd595fc98b6f25aaf0ee5684a23eece8ac5ea5e5 100644 (file)
@@ -30,7 +30,6 @@
  */
 #include "CSG_BooleanOps.h"
 
-#include "MEM_guardedalloc.h"
 
 
 
index 905515914b437452b935166b6a009a61eea27499..71a43994363d96c35c94bff0301d0293ce5449e0 100644 (file)
@@ -39,7 +39,6 @@
 #include "DNA_windowmanager_types.h"
 
 #include "WM_types.h"
-#include "WM_api.h"
 
 #include "RNA_access.h"
 
index d498b73be7ee8aca808c5558ac87d26374c910d1..382c0690ae33cb2f40da928c8a57ba2fbfe4d4f9 100644 (file)
@@ -41,6 +41,8 @@
 #include "DNA_screen_types.h"
 #include "DNA_windowmanager_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_ghash.h"
 
 #include "BKE_animsys.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 
-#include "MEM_guardedalloc.h"
-
-#ifndef DISABLE_PYTHON
-#include "BPY_extern.h"
-#endif
-
- #include "depsgraph_private.h"
+#include "depsgraph_private.h"
  
 /* Queue and stack operations for dag traversal 
  *
index 3271749643a2216503fd1b6601f7b485759a7bb1..124e636577764ff88ebbc13adafdebc317df5c2b 100644 (file)
 #include "BKE_idprop.h"
 #include "BKE_utildefines.h"
 
-#ifndef DISABLE_PYTHON
-#include "BPY_extern.h" /* for BPY_eval_driver() */
-#endif
-
 #define SMALL -1.0e-10
 #define SELECT 1
 
index 724536048ce937cf8ba2cfe65d10d6344e4e1a1f..9774e97f69b5f9c8c6fb504f2e2e88a8865f9a92 100644 (file)
 #include "BKE_node.h"
 #include "BKE_utildefines.h"
 
-#ifndef DISABLE_PYTHON
-#include "BPY_extern.h"
-#endif
-
 #include "GPU_material.h"
 
 /* used in UI and render */
index c35b1a8b0a843856cc7f417efaf8ac0f60af5d94..63f0f1fa09183101a94e37410b67be74c8dff569 100644 (file)
@@ -44,6 +44,8 @@
 #include "DNA_object_types.h"
 #include "DNA_meshdata_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_bmesh.h"
 #include "BKE_cloth.h"
 #include "BKE_key.h"
index ea30b33655f5445179a5a89b3f280499421b2ef8..9dca0fa82e4ab8045a0021049f36f08c014e9f50 100644 (file)
@@ -45,7 +45,6 @@
 
 #include "PIL_time.h"
 
-#include "MEM_guardedalloc.h"
 
 #include "CMP_node.h"
 #include "intern/CMP_util.h"   /* stupid include path... */
index 3343df6b8a7da1777211fd01ead6e9d3e4a0bb2d..ffb99c10c40c8fd46fee1ddf8707a7e3662c2ac6 100644 (file)
@@ -25,7 +25,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */ 
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
index 42506b6630381beaf2afa3a60183efc26713ec1f..8793c412d7dda14f8ffe24c1a3aacd6d31e59585 100644 (file)
@@ -38,7 +38,6 @@
 #else
 #include <io.h>
 #endif
-#include "MEM_guardedalloc.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_group_types.h"
@@ -47,6 +46,8 @@
 #include "DNA_screen_types.h"
 #include "DNA_sequence_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_anim.h"
 #include "BKE_animsys.h"
 #include "BKE_depsgraph.h"
 //XXX #include "BIF_previewrender.h"
 //XXX #include "BIF_editseq.h"
 
-#ifndef DISABLE_PYTHON
-#include "BPY_extern.h"
-#endif
-
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 
index a8140cb815d4aa2465025a48d61dabc4a4a47a94..6f1d32898f98ef9e1a928e53f290bb37359604b5 100644 (file)
 
 #include "BKE_screen.h"
 
-#ifndef DISABLE_PYTHON
-#include "BPY_extern.h"
-#endif
-
 /* ************ Spacetype/regiontype handling ************** */
 
 /* keep global; this has to be accessible outside of windowmanager */
index bddfeb049a8584d699e240d18e47f34513bb8eeb..01652aaa7139e5a33668e94bb0e6b8978b7a2779 100644 (file)
@@ -51,7 +51,6 @@
 #include "BLI_math.h"
 #include "BLI_editVert.h"
 
-#include "MEM_guardedalloc.h"
 
 
 /* Util macros */
index 233a1433ecbede96792194ee15199a108381b624..42df92443f367e378d4709f9b2c9187b8e0510dc 100644 (file)
 #include "BKE_main.h"
 #include "BKE_icons.h"
 
-#ifndef DISABLE_PYTHON
-#include "BPY_extern.h"
-#endif
-
 void free_world(World *wrld)
 {
        MTex *mtex;
index 0ec8837c0e7d253cc075bc641385fb30c42d6c9d..b0c05c31fa12980612f9ab1d2b716f27dbb6ec76 100644 (file)
@@ -45,7 +45,6 @@
 
 #include <stdlib.h>
 
-#include "MEM_guardedalloc.h"
 #include "DNA_userdef_types.h"
 
 #include "BKE_global.h"
index 16444c17563674649ffebf87e63f7caf90326419..0e985184f7ad3e9bbd073361f9accb7ad499a5bf 100644 (file)
@@ -41,7 +41,6 @@ extern "C" {
 #include <string.h>
 
 #include "BKE_utildefines.h"
-#include "MEM_guardedalloc.h"
 
 #include "BLI_mempool.h"
 #include "BLI_blenlib.h"
index 7069eeea510ba21a52c4cb41a7f7964868e777cc..bd721871f0a7591658ed50e2ea976694d299085a 100644 (file)
@@ -24,6 +24,8 @@
 
 #include "DNA_meshdata_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_math.h"
 #include "BLI_ghash.h"
 #include "BLI_pbvh.h"
index f2261546f5c8d3bbc010a96e000a220b7a41386d..81a635205f90ce2865b441062f89594847ba0e15 100644 (file)
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_path_util.h"
 #include "BLI_string.h"
index c67375d8aa28d30f66aa1ff028f242441ed10593..c37585faed9b8e46d2a21838c1119beb75e9ed36 100644 (file)
@@ -86,6 +86,7 @@
 #include "DNA_world_types.h"
 
 #include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 
index d46c18a553d0d1de46ca5bca25f3d520a2e34788..02e141a7a69f8a7aab0ecb17d5e0888e4cb5b556 100644 (file)
@@ -61,7 +61,6 @@
 #include "BKE_utildefines.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
index d50b50cb1076f4ab441fa7520a487d96f203f67c..d5bd09cc8f1ebaf06b32e56139f92f753d058fbb 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 
 #include "BLI_math.h"
index 525ca9aae1cc5cb64bd143d4e743ba738d93a1ad..0b5f99152dea5ed980f0ab0ad56afc6effcbb232 100644 (file)
@@ -31,7 +31,6 @@
 #include <math.h> 
 #include <float.h> 
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -39,6 +38,8 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_editVert.h"
@@ -62,7 +63,6 @@
 #include "DNA_object_types.h"
 
 #include "BIF_gl.h"
-#include "BIF_generate.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
index 8c53a03fd2b70a5a00ddfb3ca4ed1d00f6af0e06..1c9024f6f910776ddcd6b9402ec22154ee8c51db 100644 (file)
@@ -32,7 +32,6 @@
 #include <math.h>
 #include <float.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_scene_types.h"
 #include "DNA_armature_types.h"
index 54777535146383255b31a1cd938c00eb2c788748..8d8f1bf24eeb38747ded4930ac11d1585ee04a07 100644 (file)
@@ -56,7 +56,6 @@
 #include "WM_types.h"
 
 
-#include "BIF_gl.h"
 
 #include "ED_armature.h"
 #include "ED_keyframes_draw.h"
index efacc6571cf5f32224e0454cc2546d83165f32c9..b8b9c354d9adcd2713a16e964f27015eabb4c656 100644 (file)
@@ -56,7 +56,6 @@
 #include "WM_types.h"
 
 
-#include "BIF_gl.h"
 
 #include "ED_armature.h"
 #include "ED_keyframing.h"
index 7e17b6d06745862426c9fb4ab199b4fa90bc412c..525a8be53e69f9e5cc4f174208eb742a6a8a98b3 100644 (file)
@@ -54,7 +54,6 @@
 #include "BKE_modifier.h"
 #include "BKE_report.h"
 
-#include "BIF_gl.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
index 9af07d36ac0ebaece2609dac9faec3197da7e1ae..9602d80575a664e037d13666c4054433da739150 100644 (file)
 #include <stdlib.h> // for qsort
 #include <float.h>
 
-
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_context.h"
-
 #include "MEM_guardedalloc.h"
 
+#include "BKE_context.h"
+
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_editVert.h"
@@ -51,7 +50,6 @@
 //#include "BIF_interface.h"
 //#include "BIF_toolbox.h"
 //#include "BIF_graphics.h"
-#include "BIF_gl.h"
 
 
 //#include "blendef.h"
index 85c3cc916795ad8ce86cd20bbd51e3ffab3db44b..b5b6ee4e6da5eaefbe7730375707a071301fe167 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_curve_types.h"
 
index b85429e36a9731069b99db41dfba0a70f763a30b..f88d89c97acf1bb2d4ec0af574af3dfa83295c19 100644 (file)
 #include <io.h>
 #endif
 #include <stdlib.h>
+
+#include "DNA_key_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_rand.h"
 #include "BLI_ghash.h"
 
-#include "DNA_key_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
 #include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_depsgraph.h"
index 5e0e09231ebe6e03951f3a43b617c11a44466936..284dac7a0aebeb354ee60341648238dd04bb6e25 100644 (file)
@@ -32,7 +32,6 @@
 #include <math.h>
 #include <float.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "IMB_imbuf_types.h"
 
index 9073cb01d5f7dd35c4af56a5f0a3de03675ed36e..d76e5fcf17cbdd9b09a9a51d9e7b7db8372c8129 100644 (file)
 #include <stddef.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 
-
-
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
-
-
 #include "gpencil_intern.h"
 
 #if 0 // XXX disabled until grease pencil code stabilises again
index 00a6d0fb94d27be371c49f505e050b661a7fb5e5..c50e176aee63dc4dd895e2851b1a41f9d940fdcd 100644 (file)
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
@@ -47,8 +46,6 @@
 
 #include "RNA_access.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "ED_gpencil.h"
 
index d41b581e9e0f6b0986ab99b937e101a9a3d6f1e5..e0d257ca3bfc8abc7bc4cb388df03a5f0ce5d453 100644 (file)
@@ -54,8 +54,6 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 5d4621b426dbd2401c847ac96c07e8ca13693e29..4c86b9480d4da210f62126bd7c02cb3b4b22f1fe 100644 (file)
@@ -45,7 +45,6 @@
 #include "BKE_unit.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "BLF_api.h"
 
index dd690ba75d7ea3e602a97e0770ceeb94d2b079ef..c99622c751826c350d2b44d42153170921bdd5ed 100644 (file)
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
index e72bbaede4dea53b1f3dc193639e55c1a4af6d23..3ba7c654210a89eb6ecf3efd31612b7734e89c70 100644 (file)
@@ -60,7 +60,6 @@
 #include "IMB_imbuf_types.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "ED_datafiles.h"
 #include "ED_render.h"
index 360360127a0f97a32d36931d4b7e2164486186bf..03676ae5e06f99df9e6c111300b038a24417ff42 100644 (file)
@@ -40,8 +40,6 @@
 
 #include "BKE_global.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "BLF_api.h"
 
index e4bf6af15646239a90bfbfdf3b20822779f7892a..6b7d88d3c28c20a5b48231002d81c1f7aaa47f34 100644 (file)
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
index 9a88a52d4b4ee7988f6c67646678b1c82cc7ddc3..14ec7c6d0d6ff444cd7cf78b285e0e889a8a8f15 100644 (file)
@@ -44,7 +44,6 @@
 #include "WM_api.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "BLF_api.h"
 
index 8611f6dd4ea0acda766dbdaf4c7bd45a0eb7884c..de1b26e987b366dcbd59c12ba824f7d2bc7f83b8 100644 (file)
@@ -41,7 +41,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BIF_gl.h"
 
 #include "ED_screen.h"
 
index a2db192998982874e7099c5432daadd272887e7c..fc92598591a990b8cfe5f6460a680042f0f962e1 100644 (file)
@@ -50,7 +50,6 @@
 #include "BKE_context.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 
 #ifndef DISABLE_PYTHON
index 4af3aab569f5dc3a7ddd2754a76bfdb33f15e8f9..0274bf1004d651d66736a5c54758e8017067a413 100644 (file)
@@ -77,7 +77,6 @@ editmesh_mods.c, UI level access, no geometry changes
 #include "ED_view3d.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "mesh_intern.h"
 
index 5479421555973b728eb4a8a5d9a9bbe4504e158b..799ef580f631eed5cae95fd95138761506a601be 100644 (file)
@@ -37,8 +37,6 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise
 #include <math.h>
 #include <float.h>
 
-#include "MEM_guardedalloc.h"
-
 #include "BLO_sys_types.h" // for intptr_t support
 
 #include "DNA_meshdata_types.h"
@@ -47,6 +45,8 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise
 #include "DNA_scene_types.h"
 #include "DNA_key_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "RNA_define.h"
 #include "RNA_access.h"
 
@@ -66,8 +66,6 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise
 #include "BKE_bmesh.h"
 #include "BKE_report.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 876cafd4bfbce77b6697f2ca8f477e1254467555..488b59fa29ea1b43a990808f812d4aa6ec19a250 100644 (file)
@@ -59,7 +59,6 @@
 #include "IMB_imbuf_types.h"
 
 #include "ED_screen.h"
-#include "ED_util.h"
 #include "ED_space_api.h"
 #include "ED_view3d.h"
 #include "ED_mesh.h"
index a02ed82b45abf80e602c6c60227153921c679f30..6562a4b30aee8317457b11202d1056fb5bbeeb8d 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index 36879e43fe2ee0df579630dc1a734699e8816104..78404959dff3ca632ca53fde351af04a964642fc 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
-#include "IMB_imbuf_types.h"
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_editVert.h"
+#include "BLI_ghash.h"
+#include "BLI_rand.h"
 
 #include "DNA_armature_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_vfont_types.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_editVert.h"
-#include "BLI_ghash.h"
-#include "BLI_rand.h"
+#include "IMB_imbuf_types.h"
 
 #include "BKE_anim.h"
 #include "BKE_constraint.h"
index 8a0e598af9fbfbf55d754849374d624726b1ecc6..f000485466f6ea7b216b2c4be1f4e1397e12a7d7 100644 (file)
@@ -29,7 +29,6 @@
 
 #include <string.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 
index 97dc6f7486c34ca83e6bb4fc5cb6f84ee9fea26d..190c4ebc2282aa60eb5c4410b46b3b93fb0c154a 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index bbafde6075595aec93c0bf4cef1c18b402f06ec3..813f562f3806db6f13c0dd29fffb4d6b810350de 100644 (file)
@@ -55,7 +55,6 @@
 #include "WM_types.h"
 
 #include "ED_armature.h"
-#include "ED_curve.h"
 #include "ED_keyframing.h"
 #include "ED_mesh.h"
 #include "ED_screen.h"
index cbfc984337e885dcc83f3023d72f314ed8d093f0..f411f92d3952ff7bda47eac42868a2a9baaf6370 100644 (file)
@@ -77,7 +77,6 @@
 
 #include "LBM_fluidsim.h"
 
-#include "BIF_gl.h"
 
 #include "ED_screen.h"
 
index 2561a2c8dbc0d6202a53c1d6dff23cb22aefe0b2..2b579ef8af37329ba30937b63ef782450b16eb40 100644 (file)
@@ -81,7 +81,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_datafiles.h"
 #include "ED_render.h"
 #include "ED_view3d.h"
 
index 7f7c52a416e4b5ce0112b7c872382254d443eccb..dd77bfc4fd59254c951d8b52dac076c5a151e4b4 100644 (file)
@@ -51,7 +51,6 @@
 
 #include "ED_image.h"
 #include "ED_object.h"
-#include "ED_view3d.h"
 #include "ED_screen.h"
 #include "ED_screen_types.h"
 
index 198ec4fee3bfe80caf0bcd28d5cd81e2ce14b7bb..553343a8b21529dceb0de4736ee47ccaf003261f 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
-#include "IMB_imbuf.h"
-#include "IMB_imbuf_types.h"
-
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_ghash.h"
 
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_particle_types.h"
@@ -70,8 +70,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "ED_armature.h"
 #include "ED_mesh.h"
index dabb5b843266e9911d7389fec73f046381770f66..d8df9684cffc8d2c817d754972d0b26ddcb58cf4 100644 (file)
@@ -64,9 +64,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 #include "ED_screen.h"
-#include "ED_sculpt.h"
 #include "ED_view3d.h"
-#include "ED_mesh.h"
 #include "paint_intern.h"
 #include "sculpt_intern.h"
 
index b6b796bce2b79f6e51c402394c82c7914a4c2132..e92740678fd3da5a75e6243a0be3c52973b93d91 100644 (file)
@@ -30,6 +30,8 @@
  *
  */
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_math.h"
 #include "BLI_ghash.h"
 #include "BLI_threads.h"
index 0d1ab8a2c0ffcd6b7ac16d6d55dc83ce9425606c..d2067790b2ff655c839e7d631db471b275b26da9 100644 (file)
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <float.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
@@ -51,7 +50,6 @@
 /* Everything from source (BIF, BDR, BSE) ------------------------------ */ 
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
index 99160cfab7baf56b267a87205e83b19fac12363f..916b0032f17b79d4cb9ff7625fc807d706a61408 100644 (file)
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <float.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index 73148f016b0af34d1310c88fa0a380e5debbad4e..19dd4512909ad84a04708051594122fb64c2a462 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_space_types.h"
 
index 111c22c3542c52615b907d952ec40b2294b089ea..e862358c4652776dd3b09726030178ac876db009 100644 (file)
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index d841a5a7c19c56979f1595fa5f304b1da136b580..2140c59da67e91de9a15d7e3e0e705dc06f46394 100644 (file)
@@ -36,7 +36,6 @@
 #include "UI_interface.h"
 #include "UI_view2d.h"
 
-#include "BIF_gl.h"
 
 #include "ED_anim_api.h"
 #include "ED_armature.h"
index c7f80f4d724c277dc722ca0c6495bc3dd5e3c7d6..ab756b638fae4339261d037ae48fea68017f089e 100644 (file)
@@ -30,7 +30,6 @@
 #include <stdio.h>
 
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 
@@ -40,8 +39,6 @@
 #include "ED_types.h"
 
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
index f9deac6c753b1403ea0e86aa1738d90dba617f97..74d47ad675d0ff1e0fc7716a482c1ad4cb8ce116 100644 (file)
@@ -33,7 +33,6 @@
 #include <sys/stat.h>
 #include <limits.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "BLF_api.h"
 
index 0dbd10483487acb9873f188f9bfa52ac25c6c6dd..52d592706632d4bc87a6970098ad8da1fa66c1fd 100644 (file)
@@ -73,8 +73,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "RNA_access.h"
 
index 39cd48b1d8a64795445c9364c675af5734539205..b69bfdc02310a65e84e18acc5866427299ca47a6 100644 (file)
@@ -29,7 +29,6 @@
 
 #include <string.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
index 4e7661b12acd99e586712125a343490c3471338d..a7d5b2dd074a1acb8723956ebc5573656fbd20b7 100644 (file)
@@ -48,7 +48,6 @@
 #include "BKE_main.h"
 #include "BKE_screen.h"
 
-#include "BIF_gl.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index b9ef1d80ec3ff06f8a4235aa7c7cde247aa143ca..f780a6c31ee8ce0260c72cdd397601db32302160 100644 (file)
@@ -35,7 +35,6 @@
 #include <io.h>
 #endif
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index 66d07c3bd11c21ecc32e40073de1f8373a202fc2..0069e6e06751e02a5429ee846be37af35873a8be 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_scene_types.h"
 
index 7b8bf8c7973c1eb6cfec2f513dd663320129d42b..927149a268d5a00435e25f37128b7c843830bb64 100644 (file)
@@ -45,7 +45,6 @@
 #include "BKE_context.h"
 #include "BKE_fcurve.h"
 
-#include "BIF_gl.h"
 
 #include "WM_api.h"
 
index 40f048ceadb8021e2df8ab829762181b5f59db6b..7c84f0219e05780c443271620d06ee0ad242eaf8 100644 (file)
@@ -59,8 +59,6 @@
 #include "ED_screen.h"
 #include "ED_uvedit.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "RNA_access.h"
 
index 5ccd479da96ed89a7673ca99cd98869bc02e36c2..7ecb2565e72062ede5316975a8850e59c46e8a6a 100644 (file)
@@ -33,7 +33,6 @@
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
@@ -45,8 +44,6 @@
 
 #include "WM_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_interface.h"
 
index ca71b021630eb0e6e45c6e46d9ffe9525349b9a2..0b8a2d8f8437ba87d1312f8bd0cf0b23c580575e 100644 (file)
@@ -46,7 +46,6 @@
 #include "BKE_mesh.h"
 #include "BKE_screen.h"
 
-#include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
 #include "ED_mesh.h"
@@ -55,7 +54,6 @@
 #include "ED_uvedit.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "RNA_access.h"
 
index 202e79f2c2df0621e31fd6b5e071ef5a0f4cfa60..51767d3e006a922c78d0f746541b433574e1aafb 100644 (file)
@@ -50,8 +50,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_interface.h"
 
index 3787ac6213dbd76e1d1d7a98b13e890b3c404fe7..d8dfd8cb52d40e1018155c757656cf7b3f0c5182 100644 (file)
@@ -28,7 +28,6 @@
 #include <stdio.h>
 
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
@@ -38,8 +37,6 @@
 
 #include "ED_screen.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
index 798c7639d7e7bc4de0c61758bf8a2be567734efe..511ca99ff8249780c4a21e520021a5f3a53d7aa2 100644 (file)
@@ -57,7 +57,6 @@
 #include "WM_types.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_interface.h"
 
index d4d07b7c14e45d0b4200184efa6803c464c5205b..01af324334b88f87802438f14ff74b3b77bb8c5b 100644 (file)
@@ -41,7 +41,6 @@
 #include "ED_screen.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 
 #include "WM_api.h"
index e31d7635f7a2e30a684244ed9943d43f56ce7f1f..86f783733b5df1b20c455f886b1cb7a7f919868d 100644 (file)
@@ -44,7 +44,6 @@
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
-#include "BIF_gl.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index d834fb07ee733910f59cacc2bd655a9196348b5c..b00cba676d0fb6165a4a3f6ceb0f7b54b897a311 100644 (file)
@@ -35,7 +35,6 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index 2568baf0f0ad69d148678b3e72843a22a040d95d..f489fc4774fb22416c14b26b20802066607071b9 100644 (file)
@@ -37,7 +37,6 @@
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index 9c7eee39e29f5e46832a335008ea70433e9b33aa..85a169f2bb022a247d867f34f709fba2ff2c21a7 100644 (file)
@@ -31,7 +31,6 @@
 
 #include "DNA_scene_types.h"
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index 65925b1e9a29b3780f9e2913d7339fd9992c4f30..11319d817c77ff4fe6074003257273fc911b5d13 100644 (file)
@@ -44,7 +44,6 @@
 #include "BKE_node.h"
 #include "BKE_screen.h"
 
-#include "BIF_gl.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 0e33dff82a677b1bf30feb24c1aa5893b3e62541..cc7c966e397f14e20195b7b5f8576c6707f55941 100644 (file)
@@ -40,7 +40,6 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
-#include "MEM_guardedalloc.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
index 9fb4facdcc80e68b4bf62ea630bf5dceda7c31e0..829c74fd26d79d5b33857c46da2ab8ebf3c9da14 100644 (file)
@@ -51,7 +51,6 @@
 #include "BKE_texture.h"
 #include "BKE_report.h"
 
-#include "BIF_gl.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
index d98bb766e3a02012af81858e4f039b8965242b02..17c50b32e9836ba38a311784550191f1d0a586b0 100644 (file)
@@ -47,8 +47,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_interface.h"
 
index 9f50245551e5e2892c89ab3bc9bdfbb394be087b..d9a4dda9d6e03009eab91eee12095536d062c3e0 100644 (file)
@@ -46,7 +46,6 @@
 #include "ED_render.h"
 #include "ED_screen.h"
 
-#include "BIF_gl.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index fc08f3390c9781bb2620ed75ab8634e78bb98371..fd9d46d56994d5770f4bc5bdf038156397aa7b5d 100644 (file)
@@ -59,7 +59,6 @@
 # include <fnmatch.h>
 #endif
 
-#include "IMB_imbuf_types.h"
 
 #include "BKE_animsys.h"
 #include "BKE_context.h"
index 829538b9174b26123c77a4610b21db078c067cc3..d3db64d6d031ab963469cccea9f986c02df7aa9d 100644 (file)
@@ -45,7 +45,6 @@
 #include "WM_types.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
index fe5ecd10eb118fd464125d8b5682857878c08474..610fecaa543522a9b3be88bbeea208a01bd4a290 100644 (file)
@@ -30,7 +30,6 @@
 #include <stdio.h>
 
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 
index 4fc6aa78f667cef60cfa545c66ffe07fd6a88973..6e65d458451e4fb5725d80006cb89491329adedc 100644 (file)
@@ -30,7 +30,6 @@
 #include <stdio.h>
 
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 
@@ -41,8 +40,6 @@
 #include "ED_util.h"
 
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
index e392f8d6e1215bb3ba42c7c2feb602bea71858f7..a52ffbd0808b2542db8006cc140c073bbc1259b4 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
index c426cd9fdc2b92a5759dad13435e0f66f725f6c1..e58e2ebb3283feb02cfc9d8de6bf7f3a2a5cdd46 100644 (file)
@@ -51,8 +51,6 @@
 #include "BKE_sequencer.h"
 #include "BKE_report.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 6d1c6aa45a8a6aa7f0fa1862c459b3b85d45f69b..6ca0a13f1726ee052927af3ad87171a2d03bb60c 100644 (file)
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_space_types.h"
 
index ecc7aa0c63096c9f744be2d2ec1c0c205b3d3e2c..a61e05517d9a07909256d72b1224c0b51ce269e0 100644 (file)
@@ -35,7 +35,6 @@
 #endif
 #include <sys/types.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index 2e5bb4a63e051b44bd7b880dee193c0bff1f1932..051202b28effeec6f3b53e1b0e6f1352bf8a5c0d 100644 (file)
@@ -49,7 +49,6 @@
 #include "BKE_utildefines.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "ED_datafiles.h"
 #include "UI_interface.h"
index 4b37994c39e1e7cbd249f6be08374a960d5e9894..672940cf3cb157cc4829a5a14c3b5214ede5da40 100644 (file)
 
 #include "WM_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 
 
 #ifndef DISABLE_PYTHON
-#include "BPY_extern.h"
 // XXX #include "BPY_menus.h"
 #endif
 
index 95e8a724d32ebb0e55079de4b0e717a222ed5584..fb80d54d5e6ae882bd26c7590bee0fbf621277fc 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_scene_types.h"
 
index 4d6d303625b9cbc8843706d7178052492bcacb5e..8eea83a1083710b99fad81b290ee9105002509a5 100644 (file)
@@ -39,7 +39,6 @@
 
 #include "ED_screen.h"
 
-#include "BIF_gl.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 2de51c2dd92aaf16220e2136b76bb06838cdd19f..fb271556a9cf8ba27339c15d74f1bc5c54915977 100644 (file)
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
@@ -48,7 +47,6 @@
 #include "BKE_action.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "ED_armature.h"
 #include "ED_keyframes_draw.h"
index 3222f2396a4dd4e4bc3a3d081eed697a3c5239fa..adff6ffdc65a227e9d60670fb6f172577d61f548 100644 (file)
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index 406435bb1498ba1169932e36df3ae8786e157f23..65786901868eecac90ddb52d1e8089db82be97e2 100644 (file)
@@ -69,7 +69,6 @@
 #include "smoke_API.h"
 
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "GPU_extensions.h"
 
index e6c8ff2c2687f9bcfeb2ef32e2f9d493a4a479c8..19d182de54b675e2a41fc7ad1de7f91990960eb8 100644 (file)
@@ -56,7 +56,6 @@
 #include "BKE_screen.h"
 #include "BKE_deform.h"
 
-#include "BIF_gl.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 840cedd8360be2af6b53cc28cd1cb0899ef256f4..048a0d956175345ff4a71513bd92fc9f390a647f 100644 (file)
@@ -75,7 +75,6 @@
 #include "ED_space_api.h"
 #include "ED_screen_types.h"
 #include "ED_transform.h"
-#include "ED_gpencil.h"
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
index aa7e0e51caefcfd1acd167e2c806a04a8e22d6ca..08dde98b4efd8a5af4f4da2b8b40e416cb308791 100644 (file)
@@ -58,8 +58,6 @@
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
index d230085716d7f7e35cc84f556378adbaee155dbf..2734e5807828d8451f9aa90933047bc2b93bfdf1 100644 (file)
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index 7cb6921902c63fcd32dee28ce854141acbc4f9b6..e47a3af19f105e435e5f60451876d3d1f906d7c5 100644 (file)
@@ -46,7 +46,6 @@
 #include "BKE_global.h"
 #include "BKE_screen.h"
 
-#include "BIF_gl.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
index 3abd2dc25c10adb42277c0f0d2199fb0b565f363..1e6916f0a86b82ce5894249886e0f7083553f25e 100644 (file)
@@ -38,7 +38,6 @@
 #include <io.h>
 #endif
 
-#include "MEM_guardedalloc.h"
 
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index fa0a9f7f832232f67056397cc4b9965cd0a55c01..ebc3ad89c95f89541d0c8c487ba1e6c69dd0a799 100644 (file)
@@ -35,8 +35,6 @@
 #include <string.h>
 #include <math.h>
 
-#include "MEM_guardedalloc.h"
-
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_lattice_types.h"
@@ -50,6 +48,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_meshdata_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_context.h"
@@ -69,7 +69,6 @@
 #include "BKE_bmesh.h"
 #include "BKE_scene.h"
 
-#include "BIF_gl.h"
 
 #include "ED_anim_api.h"
 #include "ED_armature.h"
index 742001cae740d30a744c1686c6da1057d31cd9ed..d244b2f6b30443dcc7d9032bd09053b1c38cabd5 100644 (file)
@@ -54,7 +54,6 @@
 //#include "editmesh.h"
 //#include "BIF_editsima.h"
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 //#include "BIF_mywindow.h"
 //#include "BIF_screen.h"
 //#include "BIF_editsima.h"
index 75038698643c028e1f8e0a0a8e47f6471c82ca12..fa8ff7a6354cde49196821232cc19d3c3df94846 100644 (file)
@@ -39,8 +39,6 @@
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
 
-#include "IMB_imbuf.h"
-#include "IMB_imbuf_types.h"
 
 #include "BLI_blenlib.h"
 
index fe9d116c8cac5e44e2b48fa499f9250761614c78..cdc4ee115183acf3f2d00174908e6266b73a6f76 100644 (file)
@@ -27,7 +27,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "MEM_guardedalloc.h"
 
 #include "BIK_api.h"
 #include "BLI_blenlib.h"
index 8e00c7c7cf1a78c29c70141daaeaf77428904e91..3f440c0bf6f779e42843003b6f0be5d231dbae02 100644 (file)
@@ -42,6 +42,7 @@
 #include "imbuf.h"
 
 #include "MEM_CacheLimiterC-Api.h"
+#include "MEM_guardedalloc.h"
 
 void imb_freemipmapImBuf(ImBuf *ibuf)
 {
index 69e547cd8dfe06bffa4bb0286524c7de46e79168..096ed499f85fbadc2fb683ec77e245c5372dd2dd 100644 (file)
@@ -60,6 +60,8 @@
 
 #include "BLI_blenlib.h" /* BLI_remlink BLI_filesize BLI_addtail
                                                        BLI_countlist BLI_stringdec */
+#include "MEM_guardedalloc.h"
+
 #include "DNA_userdef_types.h"
 #include "BKE_global.h"
 #include "BKE_depsgraph.h"
index d15826df2f0577ed9e004316b3fef7fe44e129fc..77e01d8ebefb46524bae642ef5c40bff72c7e5f0 100644 (file)
@@ -20,6 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_ghash.h"
 #include "BLI_listbase.h"
 #include "BLI_memarena.h"
index 3ee05da15c9cd476934d1d635992eeda95c438ca..3cc266e460e598426c5480b0554508a84cf61ea3 100644 (file)
@@ -30,6 +30,7 @@
  */
 
 #include "BKE_utildefines.h"
+#include "MEM_guardedalloc.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
index 047795355b3afc9da9d49e0c4608d52410427534..1e2f3ec461a7530b6b67d350a92d346016342196 100644 (file)
@@ -51,8 +51,6 @@
 #include <sys/mman.h>
 #endif
 
-#include "MEM_guardedalloc.h"
-
 #if !defined(WIN32)
 #define O_BINARY 0
 #endif
index dc9c7a1dc3b1f57ac1398097a5e812fdf7a596f1..c676c401ccde631d0065c5f83bd5fadef14a1b55 100644 (file)
  */
 
 #include <string.h>
+
 #include "BLI_blenlib.h"
+#include "MEM_guardedalloc.h"
+
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
index 4df8d8a2271d4a5fc25be0787bfc369f6017fe06..6344b227174c10bd807881c1cd26d868fba76ff6 100644 (file)
@@ -31,6 +31,7 @@
 #include "png.h"
 
 #include "BLI_blenlib.h"
+#include "MEM_guardedalloc.h"
 
 #include "imbuf.h"
 
index e0e52bb7094e107d9890df709a94f1e98629f098..4edb7ac7877e0d589878ffe55951707509eafc16 100644 (file)
@@ -30,7 +30,8 @@
  */
 
 #include "BLI_blenlib.h"
-#include  "BKE_utildefines.h"
+#include "BKE_utildefines.h"
+#include "MEM_guardedalloc.h"
 
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"
index 335e16402f96b69dd535f941855f7cdbfdc8354d..f26eec51b03804746ff5d959d8ee97121dfa57e9 100644 (file)
@@ -30,6 +30,7 @@
  */
 
 #include "BLI_blenlib.h"
+#include "MEM_guardedalloc.h"
 
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"
index 09aaccc1ab630eda48a869b3a124cd9dddb56524..b5434b85b5a8b319af0071c8d1cecafbd797e391 100644 (file)
@@ -31,6 +31,7 @@
 #include <io.h>
 #endif
 #include "BLI_blenlib.h"
+#include "MEM_guardedalloc.h"
 
 #include "imbuf.h"
 
index 49c676972919114f85af29c8deeca34a034bd426..17cd2e5ef6bba2ddf6eb00c96b7999744843ef73 100644 (file)
@@ -36,6 +36,8 @@
 #include "DNA_object_force.h"
 #include "DNA_scene_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_math.h"
 
 #include "BKE_animsys.h"
index 37b453ad7a446e89971ceba05b0dead6fded0546..eeb223ed54a1ad79a3e290dec3c6dfed64b6fa3d 100644 (file)
@@ -37,7 +37,6 @@
 #include "DNA_scene_types.h"
 
 #include "BLI_math.h"
-#include "BLI_ghash.h"
 
 #include "WM_types.h"
 
 
 #include "DNA_userdef_types.h"
 
+#include "MEM_guardedalloc.h"
+
+#include "BLI_ghash.h"
+
 #include "BKE_context.h"
 #include "BKE_constraint.h"
 #include "BKE_depsgraph.h"
index d3c81e3f3245e4bc570405eac3141bef1aba9dd1..6c7670907b7e0dcdeacec85830f85c3f9795fa20 100644 (file)
@@ -53,7 +53,7 @@ EnumPropertyItem property_unit_items[] = {
        {0, NULL, 0, NULL, NULL}};
 
 #ifdef RNA_RUNTIME
-
+#include "MEM_guardedalloc.h"
 #include "BLI_ghash.h"
 
 /* Struct */
index 0526263de9b57afae9e1bd30244645534602814d..1cec4f7124c4cdf9d71e3b005a5e12fa291977db 100644 (file)
@@ -150,6 +150,8 @@ EnumPropertyItem image_type_items[] = {
 #include "DNA_object_types.h"
 #include "DNA_mesh_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
index 435c90eb623d0168feae5627857a22c84662ed81..9602cd22fcda9b514f518d15b8a6582e882fe86e 100644 (file)
@@ -49,6 +49,7 @@ static EnumPropertyItem particle_edit_hair_brush_items[] = {
        {0, NULL, 0, NULL, NULL}};
 
 #ifdef RNA_RUNTIME
+#include "MEM_guardedalloc.h"
 
 #include "BKE_context.h"
 #include "BKE_pointcache.h"
index 66c5f375ba8d26dab3e2cc356a251827bea0c39c..a6fefbcd8634ef8a8c3bd2cc08a0aedefc0ce2a1 100644 (file)
 
 /* Array modifier: duplicates the object multiple times along an axis */
 
-#include "DNA_curve_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_object_types.h"
+#include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
 #include "BLI_ghash.h"
 #include "BLI_edgehash.h"
 
+#include "DNA_curve_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
+
 #include "BKE_cdderivedmesh.h"
 #include "BKE_displist.h"
 #include "BKE_mesh.h"
index eabd6e4957d0a54d78b2b717f52f4d42992a65bf..62c7dfa5600c921e218f8dc68ef70df91b73045e 100644 (file)
@@ -29,6 +29,7 @@
 * ***** END GPL LICENSE BLOCK *****
 *
 */
+#include "MEM_guardedalloc.h"
 
 #include "BKE_bmesh.h"
 #include "BKE_cdderivedmesh.h"
index 11d47bfffb1690bc014991cb646ff63b5d32ed0c..2fba4c6a603731a8738ecd4529eecf3e8fa29715 100644 (file)
@@ -34,6 +34,8 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_math.h"
 #include "BLI_ghash.h"
 
index 47693ba337e03d2ac918a925503ef040ae132b41..8fc1be7d5ee71f6a476d20a28665b05c6fa3b35b 100644 (file)
@@ -30,6 +30,8 @@
 *
 */
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_rand.h"
 #include "BLI_ghash.h"
 
index 4d850e1bd95351e3c2e1da10b0ba57206b361d6d..bfb5f6ee028a2fac80f7490a22b6f6f6079bfb28 100644 (file)
@@ -34,6 +34,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_cloth.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_global.h"
index 9e979822d6f0275dd0b4625f8589dc9beb4d67aa..32fbd58839a0ca3f9bfd38e93e99a70901213190 100644 (file)
@@ -34,6 +34,8 @@
 #include "DNA_object_types.h"
 #include "DNA_meshdata_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_math.h"
 
 #include "BKE_collision.h"
index 15547a1d95e21e6e9e840948ac19c8dbecfd5e9e..94eb2380b665c814a2f410b03178f721b0dae698 100644 (file)
 *
 */
 
+#include "MEM_guardedalloc.h"
+
+#include "BLI_ghash.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_ghash.h"
-
 #include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
index 0f4bf00d1adda025725bb6e4a6850db878a78521..4f5acc60cda3765fa1da9da2d4245211cca938a1 100644 (file)
@@ -32,6 +32,8 @@
 
 #include "DNA_meshdata_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_math.h"
 #include "BLI_listbase.h"
 #include "BLI_rand.h"
index e3efb90ec0494626e4709208975787778dc5b314..133a3d4a005f2afb48ebde693f64fde3f87d136c 100644 (file)
@@ -28,7 +28,6 @@
  */
 #include "rayobject.h"
 #include "raycounter.h"
-#include "MEM_guardedalloc.h"
 #include "rayobject_rtbuild.h"
 #include "rayobject_hint.h"
 
index b1d379f4d1b75711b6585c82baf55e426bd7a393..502bd09c2de8769c7283547ab1f60f87444be7a7 100644 (file)
@@ -39,6 +39,8 @@
 #include "DNA_sequence_types.h"
 #include "DNA_userdef_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
@@ -52,8 +54,6 @@
 #include "BKE_pointcache.h"
 #include "BKE_animsys.h"       /* <------ should this be here?, needed for sequencer update */
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_rand.h"
index 7dd2543e89d75d1974a4b6634f450a83aa2764d8..97d6b6efd273d4b6df36d099f76e5e3f48b1d679 100644 (file)
@@ -30,6 +30,7 @@
 #include "BL_ArmatureObject.h"
 #include "BL_ActionActuator.h"
 #include "KX_BlenderSceneConverter.h"
+#include "MEM_guardedalloc.h"
 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
 #include "BLI_math.h"