split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 7 Jan 2011 18:36:47 +0000 (18:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 7 Jan 2011 18:36:47 +0000 (18:36 +0000)
no functional changes.

454 files changed:
source/blender/blenkernel/BKE_array_mallocn.h [new file with mode: 0644]
source/blender/blenkernel/BKE_bmesh.h
source/blender/blenkernel/BKE_utildefines.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/BME_conversions.c
source/blender/blenkernel/intern/BME_eulers.c
source/blender/blenkernel/intern/BME_structure.c
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/customdata_file.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/exotic.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/fluidsim.c
source/blender/blenkernel/intern/fmodifier.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/implicit.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/lattice.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/nla.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/packedFile.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/report.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/seqcache.c
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/sketch.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenkernel/intern/text.c
source/blender/blenkernel/intern/texture.c
source/blender/blenkernel/intern/writeavi.c
source/blender/blenkernel/intern/writeframeserver.c
source/blender/blenlib/BLI_ghash.h
source/blender/blenlib/BLI_utildefines.h [new file with mode: 0644]
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/BLI_args.c
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/blenlib/intern/bpath.c
source/blender/blenlib/intern/freetypefont.c
source/blender/blenlib/intern/graph.c
source/blender/blenlib/intern/math_geom.c
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/pbvh.c
source/blender/blenlib/intern/voxel.c
source/blender/blenloader/intern/readblenentry.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/DocumentImporter.cpp
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_deps.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/anim_ipo_utils.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/animation/drivers.c
source/blender/editors/animation/fmodifier_ui.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/animation/keyframes_general.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/editarmature_generate.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/editarmature_sketch.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/armature/poseSlide.c
source/blender/editors/armature/poseUtils.c
source/blender/editors/armature/poselib.c
source/blender/editors/armature/poseobject.c
source/blender/editors/armature/reeb.c
source/blender/editors/curve/editcurve.c
source/blender/editors/curve/editfont.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/resources.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.c
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/mesh/editmesh_lib.c
source/blender/editors/mesh/editmesh_loop.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_data.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/metaball/mball_edit.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_constraint.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_group.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_lattice.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_select.c
source/blender/editors/object/object_shapekey.c
source/blender/editors/object/object_transform.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/physics/particle_boids.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/particle_object.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/physics/physics_pointcache.c
source/blender/editors/render/render_internal.c
source/blender/editors/render/render_opengl.c
source/blender/editors/render/render_preview.c
source/blender/editors/render/render_shading.c
source/blender/editors/screen/area.c
source/blender/editors/screen/glutil.c
source/blender/editors/screen/screen_context.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/screen/screendump.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/sculpt_paint/paint_undo.c
source/blender/editors/sculpt_paint/paint_utils.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/sound/sound_ops.c
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_action/action_select.c
source/blender/editors/space_action/space_action.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_buttons/buttons_header.c
source/blender/editors/space_buttons/buttons_ops.c
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_console/console_draw.c
source/blender/editors/space_console/console_ops.c
source/blender/editors/space_console/space_console.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/file_panels.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/graph_ops.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/image_render.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_info/info_draw.c
source/blender/editors/space_info/info_ops.c
source/blender/editors/space_info/info_report.c
source/blender/editors/space_info/info_stats.c
source/blender/editors/space_info/space_info.c
source/blender/editors/space_info/textview.c
source/blender/editors/space_logic/logic_buttons.c
source/blender/editors/space_logic/logic_ops.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_edit.c
source/blender/editors/space_nla/space_nla.c
source/blender/editors/space_node/drawnode.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/node_select.c
source/blender/editors/space_node/node_state.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/space_script.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_buttons.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_scopes.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_sound/sound_header.c
source/blender/editors/space_sound/space_sound.c
source/blender/editors/space_text/space_text.c
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_text/text_header.c
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_time/space_time.c
source/blender/editors/space_time/time_ops.c
source/blender/editors/space_userpref/space_userpref.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_fly.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_constraints.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_input.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_ndofinput.c
source/blender/editors/transform/transform_ops.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/util/editmode_undo.c
source/blender/editors/util/numinput.c
source/blender/editors/util/undo.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_parametrizer.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_material.c
source/blender/ikplugin/intern/iksolver_plugin.c
source/blender/ikplugin/intern/itasc_plugin.cpp
source/blender/imbuf/intern/anim_movie.c
source/blender/imbuf/intern/cache.c
source/blender/imbuf/intern/divers.c
source/blender/imbuf/intern/filter.c
source/blender/imbuf/intern/rectop.c
source/blender/imbuf/intern/rotate.c
source/blender/imbuf/intern/thumbs_blend.c
source/blender/imbuf/intern/tiff.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_actuator.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_animviz.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_boid.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_cloth.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_define.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/makesrna/intern/rna_gpencil.c
source/blender/makesrna/intern/rna_group.c
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_key.c
source/blender/makesrna/intern/rna_lamp.c
source/blender/makesrna/intern/rna_lattice.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_meta.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nla.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_property.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_sensor.c
source/blender/makesrna/intern/rna_sequencer.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_text.c
source/blender/makesrna/intern/rna_texture.c
source/blender/makesrna/intern/rna_ui.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c
source/blender/makesrna/intern/rna_world.c
source/blender/modifiers/intern/MOD_armature.c
source/blender/modifiers/intern/MOD_array.c
source/blender/modifiers/intern/MOD_bevel.c
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_boolean_util.c
source/blender/modifiers/intern/MOD_build.c
source/blender/modifiers/intern/MOD_cast.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_curve.c
source/blender/modifiers/intern/MOD_decimate.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_edgesplit.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_fluidsim.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_lattice.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/modifiers/intern/MOD_none.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/modifiers/intern/MOD_particlesystem.c
source/blender/modifiers/intern/MOD_screw.c
source/blender/modifiers/intern/MOD_shapekey.c
source/blender/modifiers/intern/MOD_shrinkwrap.c
source/blender/modifiers/intern/MOD_simpledeform.c
source/blender/modifiers/intern/MOD_smoke.c
source/blender/modifiers/intern/MOD_smooth.c
source/blender/modifiers/intern/MOD_softbody.c
source/blender/modifiers/intern/MOD_solidify.c
source/blender/modifiers/intern/MOD_subsurf.c
source/blender/modifiers/intern/MOD_surface.c
source/blender/modifiers/intern/MOD_util.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/nodes/intern/CMP_util.h
source/blender/nodes/intern/SHD_util.h
source/blender/nodes/intern/TEX_util.h
source/blender/python/generic/IDProp.c
source/blender/python/generic/bgl.c
source/blender/python/generic/blf_py_api.c
source/blender/python/generic/bpy_internal_import.c
source/blender/python/generic/mathutils.c
source/blender/python/generic/mathutils_color.c
source/blender/python/generic/mathutils_euler.c
source/blender/python/generic/mathutils_geometry.c
source/blender/python/generic/mathutils_matrix.c
source/blender/python/generic/mathutils_quat.c
source/blender/python/generic/mathutils_vector.c
source/blender/python/generic/noise.c
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_app.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_operator.c
source/blender/python/intern/bpy_operator_wrap.c
source/blender/python/intern/bpy_props.c
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_rna_callback.c
source/blender/render/intern/raytrace/bvh.h
source/blender/render/intern/raytrace/rayobject.cpp
source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
source/blender/render/intern/raytrace/reorganize.h
source/blender/render/intern/raytrace/svbvh.h
source/blender/render/intern/raytrace/vbvh.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/imagetexture.c
source/blender/render/intern/source/initrender.c
source/blender/render/intern/source/occlusion.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/pixelshading.c
source/blender/render/intern/source/pointdensity.c
source/blender/render/intern/source/rayobject_blibvh.c
source/blender/render/intern/source/rayobject_instance.c
source/blender/render/intern/source/rayobject_octree.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/blender/render/intern/source/renderdatabase.c
source/blender/render/intern/source/shadbuf.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/blender/render/intern/source/sss.c
source/blender/render/intern/source/strand.c
source/blender/render/intern/source/texture.c
source/blender/render/intern/source/volume_precache.c
source/blender/render/intern/source/volumetric.c
source/blender/render/intern/source/voxeldata.c
source/blender/render/intern/source/zbuf.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_draw.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_gesture.c
source/blender/windowmanager/intern/wm_keymap.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_subwindow.c
source/blender/windowmanager/intern/wm_window.c
source/creator/buildinfo.c
source/creator/creator.c
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_ModifierDeformer.cpp
source/gameengine/Converter/BL_SkinDeformer.cpp

diff --git a/source/blender/blenkernel/BKE_array_mallocn.h b/source/blender/blenkernel/BKE_array_mallocn.h
new file mode 100644 (file)
index 0000000..c2ced0e
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ * $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 BKE_ARRAY_MALLOCN_H
+#define BKE_ARRAY_MALLOCN_H
+
+/*little array macro library.  example of usage:
+
+int *arr = NULL;
+V_DECLARE(arr);
+int i;
+
+for (i=0; i<10; i++) {
+       V_GROW(arr);
+       arr[i] = something;
+}
+V_FREE(arr);
+
+arrays are buffered, using double-buffering (so on each reallocation,
+the array size is doubled).  supposedly this should give good Big Oh
+behaviour, though it may not be the best in practice.
+*/
+
+#define V_DECLARE(vec) int _##vec##_count=0; void *_##vec##_tmp
+
+/*in the future, I plan on having V_DECLARE allocate stack memory it'll
+  use at first, and switch over to heap when it needs more.  that'll mess
+  up cases where you'd want to use this API to build a dynamic list for
+  non-local use, so all such cases should use this macro.*/
+#define V_DYNDECLARE(vec) V_DECLARE(vec)
+
+/*this returns the entire size of the array, including any buffering.*/
+#define V_SIZE(vec) ((signed int)((vec)==NULL ? 0 : MEM_allocN_len(vec) / sizeof(*vec)))
+
+/*this returns the logical size of the array, not including buffering.*/
+#define V_COUNT(vec) _##vec##_count
+
+/*grow the array by one.  zeroes the new elements.*/
+#define V_GROW(vec) \
+       V_SIZE(vec) > _##vec##_count ? _##vec##_count++ : \
+       ((_##vec##_tmp = MEM_callocN(sizeof(*vec)*(_##vec##_count*2+2), #vec " " __FILE__ " ")),\
+       (void)(vec && memcpy(_##vec##_tmp, vec, sizeof(*vec) * _##vec##_count)),\
+       (void)(vec && (MEM_freeN(vec),1)),\
+       (vec = _##vec##_tmp),\
+       _##vec##_count++)
+
+#define V_FREE(vec) if (vec) MEM_freeN(vec);
+
+/*resets the logical size of an array to zero, but doesn't
+  free the memory.*/
+#define V_RESET(vec) _##vec##_count=0
+
+/*set the count of the array*/
+#define V_SETCOUNT(vec, count) _##vec##_count = (count)
+
+#endif // BKE_ARRAY_MALLOCN_H
index 18db68a93af9c79853a18f3c664b875cf85d6837..44ca3842fd98387e46c02a66095555139ce5a201 100644 (file)
@@ -38,6 +38,7 @@
 #define BKE_BMESH_H
 
 #include "DNA_listBase.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_mempool.h"
 #include "BLI_memarena.h"
index 46746bbb4a349a4f8dd52139ff7cd22aaaa2c0a2..781de5e219ed2089bbd190af77336ab35bafb34c 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
 */
 
+/* This file shold contain blender format spesific macros
+ * generic defines should go in BLI_utildefines.h */
+
 #ifndef BKE_UTILDEFINES_H
 #define BKE_UTILDEFINES_H
 
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-/* Macro to convert a value to string in the preprocessor
- * STRINGIFY_ARG: gives the defined name in the string
- * STRINGIFY: gives the defined value. */
-#define STRINGIFY_ARG(x) #x
-#define STRINGIFY(x) STRINGIFY_ARG(x)
-
-/* useful for debugging */
-#define AT __FILE__ ":" STRINGIFY(__LINE__)
-
-
-#ifdef __GNUC__
-#  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
-#else
-#  define UNUSED(x) UNUSED_ ## x
-#endif
-
-
-/* BKE_assert(), default only to print
- * for aborting need to define WITH_ASSERT_ABORT */
-#if !defined NDEBUG
-#  ifdef WITH_ASSERT_ABORT
-#    define _dummy_abort abort
-#  else
-#    define _dummy_abort() (void)0
-#  endif
-#  ifdef __GNUC__ /* just want to check if __func__ is available */
-#    define BKE_assert(a) \
-do { \
-       if (0 == (a)) { \
-               fprintf(stderr, \
-                       "BKE_assert failed: %s, %s(), %d at \'%s\'\n", \
-                       __FILE__, __func__, __LINE__, STRINGIFY(a)); \
-               _dummy_abort(); \
-       } \
-} while (0)
-#  else
-#    define BKE_assert(a) \
-do { \
-       if (0 == (a)) { \
-               fprintf(stderr, \
-                       "BKE_assert failed: %s, %d at \'%s\'\n", \
-                       __FILE__, __LINE__, STRINGIFY(a)); \
-               _dummy_abort(); \
-       } \
-} while (0)
-#  endif
-#else
-#  define BKE_assert(a) (void)0
-#endif
-
-
 /* these values need to be hardcoded in structs, dna does not recognize defines */
 /* also defined in DNA_space_types.h */
 #ifndef FILE_MAXDIR
@@ -97,94 +41,6 @@ do { \
 #define FILE_MAX                       240
 #endif
 
-#define ELEM(a, b, c)           ( (a)==(b) || (a)==(c) )
-#define ELEM3(a, b, c, d)       ( ELEM(a, b, c) || (a)==(d) )
-#define ELEM4(a, b, c, d, e)    ( ELEM(a, b, c) || ELEM(a, d, e) )
-#define ELEM5(a, b, c, d, e, f) ( ELEM(a, b, c) || ELEM3(a, d, e, f) )
-#define ELEM6(a, b, c, d, e, f, g)      ( ELEM(a, b, c) || ELEM4(a, d, e, f, g) )
-#define ELEM7(a, b, c, d, e, f, g, h)   ( ELEM3(a, b, c, d) || ELEM4(a, e, f, g, h) )
-#define ELEM8(a, b, c, d, e, f, g, h, i)        ( ELEM4(a, b, c, d, e) || ELEM4(a, f, g, h, i) )
-#define ELEM9(a, b, c, d, e, f, g, h, i, j)        ( ELEM4(a, b, c, d, e) || ELEM5(a, f, g, h, i, j) )
-#define ELEM10(a, b, c, d, e, f, g, h, i, j, k)        ( ELEM4(a, b, c, d, e) || ELEM6(a, f, g, h, i, j, k) )
-#define ELEM11(a, b, c, d, e, f, g, h, i, j, k, l)        ( ELEM4(a, b, c, d, e) || ELEM7(a, f, g, h, i, j, k, l) )
-
-/* shift around elements */
-#define SHIFT3(type, a, b, c) { type tmp; tmp = a; a = c; c = b; b = tmp; }
-#define SHIFT4(type, a, b, c, d) { type tmp; tmp = a; a = d; d = c; c = b; b = tmp; }
-
-/* min/max */
-#define MIN2(x,y)               ( (x)<(y) ? (x) : (y) )
-#define MIN3(x,y,z)             MIN2( MIN2((x),(y)) , (z) )
-#define MIN4(x,y,z,a)           MIN2( MIN2((x),(y)) , MIN2((z),(a)) )
-
-#define MAX2(x,y)               ( (x)>(y) ? (x) : (y) )
-#define MAX3(x,y,z)             MAX2( MAX2((x),(y)) , (z) )
-#define MAX4(x,y,z,a)           MAX2( MAX2((x),(y)) , MAX2((z),(a)) )
-
-#define INIT_MINMAX(min, max) { (min)[0]= (min)[1]= (min)[2]= 1.0e30f; (max)[0]= (max)[1]= (max)[2]= -1.0e30f; }
-
-#define INIT_MINMAX2(min, max) { (min)[0]= (min)[1]= 1.0e30f; (max)[0]= (max)[1]= -1.0e30f; }
-
-#define DO_MIN(vec, min) { if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0];      \
-                                                         if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1];   \
-                                                         if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; } \
-
-#define DO_MAX(vec, max) { if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0];         \
-                                                         if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1];   \
-                                                         if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; } \
-
-#define DO_MINMAX(vec, min, max) { if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
-                                                         if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
-                                                         if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; \
-                                                         if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
-                                                         if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \
-                                                         if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; } \
-
-#define DO_MINMAX2(vec, min, max) { if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
-                                                         if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
-                                                         if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
-                                                         if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; }
-
-/* some math and copy defines */
-
-#ifndef SWAP
-#define SWAP(type, a, b)        { type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
-#endif
-
-#define ABS(a)                                 ( (a)<0 ? (-(a)) : (a) )
-
-#define AVG2(x, y)             ( 0.5 * ((x) + (y)) )
-
-#define FTOCHAR(val) ((val)<=0.0f)? 0 : (((val)>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*(val))+0.5f))
-#define FTOUSHORT(val) ((val >= 1.0f-0.5f/65535)? 65535: (val <= 0.0f)? 0: (unsigned short)(val*65535.0f + 0.5f))
-
-#define VECCOPY(v1,v2)          {*(v1)= *(v2); *(v1+1)= *(v2+1); *(v1+2)= *(v2+2);}
-#define VECCOPY2D(v1,v2)          {*(v1)= *(v2); *(v1+1)= *(v2+1);}
-#define QUATCOPY(v1,v2)         {*(v1)= *(v2); *(v1+1)= *(v2+1); *(v1+2)= *(v2+2); *(v1+3)= *(v2+3);}
-#define LONGCOPY(a, b, c)      {int lcpc=c, *lcpa=(int *)a, *lcpb=(int *)b; while(lcpc-->0) *(lcpa++)= *(lcpb++);}
-
-
-#define VECADD(v1,v2,v3)       {*(v1)= *(v2) + *(v3); *(v1+1)= *(v2+1) + *(v3+1); *(v1+2)= *(v2+2) + *(v3+2);}
-#define VECSUB(v1,v2,v3)       {*(v1)= *(v2) - *(v3); *(v1+1)= *(v2+1) - *(v3+1); *(v1+2)= *(v2+2) - *(v3+2);}
-#define VECSUB2D(v1,v2,v3)     {*(v1)= *(v2) - *(v3); *(v1+1)= *(v2+1) - *(v3+1);}
-#define VECADDFAC(v1,v2,v3,fac) {*(v1)= *(v2) + *(v3)*(fac); *(v1+1)= *(v2+1) + *(v3+1)*(fac); *(v1+2)= *(v2+2) + *(v3+2)*(fac);}
-#define VECSUBFAC(v1,v2,v3,fac) {*(v1)= *(v2) - *(v3)*(fac); *(v1+1)= *(v2+1) - *(v3+1)*(fac); *(v1+2)= *(v2+2) - *(v3+2)*(fac);}
-#define QUATADDFAC(v1,v2,v3,fac) {*(v1)= *(v2) + *(v3)*(fac); *(v1+1)= *(v2+1) + *(v3+1)*(fac); *(v1+2)= *(v2+2) + *(v3+2)*(fac); *(v1+3)= *(v2+3) + *(v3+3)*(fac);}
-
-#define INPR(v1, v2)           ( (v1)[0]*(v2)[0] + (v1)[1]*(v2)[1] + (v1)[2]*(v2)[2] )
-
-
-/* some misc stuff.... */
-#define CLAMP(a, b, c)         if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c)
-#define CLAMPIS(a, b, c) ((a)<(b) ? (b) : (a)>(c) ? (c) : (a))
-#define CLAMPTEST(a, b, c)     if((b)<(c)) {CLAMP(a, b, c);} else {CLAMP(a, c, b);}
-
-#define IS_EQ(a,b) ((fabs((double)(a)-(b)) >= (double) FLT_EPSILON) ? 0 : 1)
-
-#define IS_EQT(a, b, c) ((a > b)? (((a-b) <= c)? 1:0) : ((((b-a) <= c)? 1:0)))
-#define IN_RANGE(a, b, c) ((b < c)? ((b<a && a<c)? 1:0) : ((c<a && a<b)? 1:0))
-#define IN_RANGE_INCL(a, b, c) ((b < c)? ((b<=a && a<=c)? 1:0) : ((c<=a && a<=b)? 1:0))
-
 /* this weirdo pops up in two places ... */
 #if !defined(WIN32)
 #ifndef O_BINARY
@@ -203,8 +59,6 @@ do { \
 
 #define ID_NEW(a)              if( (a) && (a)->id.newid ) (a)= (void *)(a)->id.newid
 
-#define BLEN MAKE_ID('B','L','E','N')
-
 #define DATA MAKE_ID('D','A','T','A')
 #define GLOB MAKE_ID('G','L','O','B')
 #define IMAG MAKE_ID('I','M','A','G')
@@ -216,28 +70,6 @@ do { \
 
 #define ENDB MAKE_ID('E','N','D','B')
 
-
-/* This one rotates the bytes in an int64, int (32) and short (16) */
-#define SWITCH_INT64(a) { \
-       char s_i, *p_i; \
-       p_i= (char *)&(a); \
-       s_i=p_i[0]; p_i[0]=p_i[7]; p_i[7]=s_i; \
-       s_i=p_i[1]; p_i[1]=p_i[6]; p_i[6]=s_i; \
-       s_i=p_i[2]; p_i[2]=p_i[5]; p_i[5]=s_i; \
-       s_i=p_i[3]; p_i[3]=p_i[4]; p_i[4]=s_i; }
-
-#define SWITCH_INT(a) { \
-       char s_i, *p_i; \
-       p_i= (char *)&(a); \
-       s_i=p_i[0]; p_i[0]=p_i[3]; p_i[3]=s_i; \
-       s_i=p_i[1]; p_i[1]=p_i[2]; p_i[2]=s_i; }
-
-#define SWITCH_SHORT(a)        { \
-       char s_i, *p_i; \
-       p_i= (char *)&(a); \
-       s_i=p_i[0]; p_i[0]=p_i[1]; p_i[1]=s_i; }
-
-
 /* Bit operations */
 #define BTST(a,b)      ( ( (a) & 1<<(b) )!=0 )   
 #define BNTST(a,b)     ( ( (a) & 1<<(b) )==0 )
@@ -253,70 +85,6 @@ do { \
 #endif
 #define GS(a)  (*((short *)(a)))
 
-/* Warning-free macros for storing ints in pointers. Use these _only_
- * for storing an int in a pointer, not a pointer in an int (64bit)! */
-#define SET_INT_IN_POINTER(i) ((void*)(intptr_t)(i))
-#define GET_INT_FROM_POINTER(i) ((int)(intptr_t)(i))
-
-/*little array macro library.  example of usage:
-
-int *arr = NULL;
-V_DECLARE(arr);
-int i;
-
-for (i=0; i<10; i++) {
-       V_GROW(arr);
-       arr[i] = something;
-}
-V_FREE(arr);
-
-arrays are buffered, using double-buffering (so on each reallocation,
-the array size is doubled).  supposedly this should give good Big Oh
-behaviour, though it may not be the best in practice.
-*/
-
-#define V_DECLARE(vec) int _##vec##_count=0; void *_##vec##_tmp
-
-/*in the future, I plan on having V_DECLARE allocate stack memory it'll
-  use at first, and switch over to heap when it needs more.  that'll mess
-  up cases where you'd want to use this API to build a dynamic list for
-  non-local use, so all such cases should use this macro.*/
-#define V_DYNDECLARE(vec) V_DECLARE(vec)
-
-/*this returns the entire size of the array, including any buffering.*/
-#define V_SIZE(vec) ((signed int)((vec)==NULL ? 0 : MEM_allocN_len(vec) / sizeof(*vec)))
-
-/*this returns the logical size of the array, not including buffering.*/
-#define V_COUNT(vec) _##vec##_count
-
-/*grow the array by one.  zeroes the new elements.*/
-#define V_GROW(vec) \
-       V_SIZE(vec) > _##vec##_count ? _##vec##_count++ : \
-       ((_##vec##_tmp = MEM_callocN(sizeof(*vec)*(_##vec##_count*2+2), #vec " " __FILE__ " ")),\
-       (void)(vec && memcpy(_##vec##_tmp, vec, sizeof(*vec) * _##vec##_count)),\
-       (void)(vec && (MEM_freeN(vec),1)),\
-       (vec = _##vec##_tmp),\
-       _##vec##_count++)
-
-#define V_FREE(vec) if (vec) MEM_freeN(vec);
-
-/*resets the logical size of an array to zero, but doesn't
-  free the memory.*/
-#define V_RESET(vec) _##vec##_count=0
-
-/*set the count of the array*/
-#define V_SETCOUNT(vec, count) _##vec##_count = (count)
-
-/*little macro so inline keyword works*/
-#if defined(_MSC_VER)
-#define BM_INLINE static __forceinline
-#elif defined(__GNUC__)
-#define BM_INLINE static inline __attribute((always_inline))
-#else
-/* #warning "MSC/GNUC defines not found, inline non-functional" */
-#define BM_INLINE static 
-#endif
-
 #define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;}
 
-#endif
+#endif // BKE_UTILDEFINES_H
index 4df5183980f2d8e14edcd0e9e819326357b5915c..672ef0b64949d28f78453d6b430c264edd3ee733 100644 (file)
@@ -144,6 +144,7 @@ set(SRC
        BKE_anim.h
        BKE_animsys.h
        BKE_armature.h
+       BKE_array_mallocn.h
        BKE_blender.h
        BKE_bmesh.h
        BKE_bmeshCustomData.h
index 341eb38b388da0d6386ae9b9830fb113ff89ad55..e80d4827155a7d9584028973e7231e449ed054fa 100644 (file)
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_edgehash.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_mesh.h"
 #include "BKE_cdderivedmesh.h"
 
-#include "BLI_edgehash.h"
 //XXX #include "BIF_editmesh.h"
 //XXX #include "editmesh.h"
 #include "bmesh_private.h"
index 036cd4a23e2f8842eadf74cd2881f53cd6930ced..cd9429982dc91fff012c17c8d1b6fd23fc840b7e 100644 (file)
@@ -33,7 +33,7 @@
  */
 
 #include "MEM_guardedalloc.h"
-
+#include "BLI_utildefines.h"
 
 #include "bmesh_private.h"
 
index de3eb94beac743d4b90898b5c182a5b21f2733d4..9463d22e3be373c523736756b2d4c9a752bf45df 100644 (file)
@@ -33,8 +33,9 @@
  */
 
 #include <limits.h>
-#include "MEM_guardedalloc.h"
 
+#include "MEM_guardedalloc.h"
+#include "BLI_utildefines.h"
 #include "BKE_bmesh.h"
 /**
  *     MISC utility functions.
index 444bc10d562883b4937f1eb3f5c96ef0024e73be..0c8352ad8b07dd8037a26f8b0589900f203b4a2a 100644 (file)
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "BKE_bmesh.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_bmesh.h"
 
 /*split this all into a seperate bevel.c file in src*/
 
index 3d87b77dec90109fc74bcddcb70254a4f8993ce1..3b8da3975a05141404757ae23a5d13a87449c309 100644 (file)
@@ -43,6 +43,7 @@
 #include "BLI_math.h"
 #include "BLI_memarena.h"
 #include "BLI_pbvh.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_displist.h"
index fdd51dd207f167357e8bc2296b23d499f58dbca7..bd36e1b272027baf59ff4311f8eb2c17e7d7fc8f 100644 (file)
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+#include "BLI_ghash.h"
+
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_anim.h"
 
 #include "BIK_api.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_ghash.h"
-#include "BLI_math.h"
-
 #include "RNA_access.h"
 
 /* *********************** NOTE ON POSE AND ACTION **********************
index c372855b3ebfb2f501bdc44f9977b6fefb25bae4..8cac3860e795b985d88eafbee7d10f4db863112e 100644 (file)
@@ -39,6 +39,7 @@
 #include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index abe5b50664ff62af5b13b64b64957717c68407c2..e46c11791114115f008eb0b0a91e5694c96c2cbb 100644 (file)
@@ -36,8 +36,8 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BKE_library.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_material_types.h"
@@ -50,6 +50,7 @@
 #include "BKE_nla.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "BKE_library.h"
 #include "BKE_utildefines.h"
 
 #include "RNA_access.h"
index 6b21e45ddd9d47519783a978d106517df2536519..0367d8541690d2d39a06229c87bc882b943b8a9e 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index b218632e8e5a0a846776429f8a2cb3caf7021385..7d75912f31d9f635823f3f40fc859a8bb48262df 100644 (file)
@@ -58,6 +58,7 @@
 #include "BLI_bpath.h"
 #include "BLI_dynstr.h"
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 
 #include "IMB_imbuf.h"
 
index 1bde06390551a64b412891174bf12b7800add6ce..85ee37608494fac99b22a21b1fc72e4fb519a76e 100644 (file)
@@ -41,6 +41,8 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_kdtree.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_collision.h"
 #include "BKE_effect.h"
 #include "BKE_boids.h"
index 649b3e3ad9b4d224c206ed7f450e9c8693d6892e..a78d2ecaaa2acb738b794f4f22182b0722b2f3bd 100644 (file)
@@ -45,6 +45,7 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_brush.h"
 #include "BKE_colortools.h"
index 882295b931cafed89090a015677545c89bbaaadb..0d3825fa8a834f0f980e3bb2ace8518032597580 100644 (file)
 
 #include "DNA_meshdata_types.h"
 
+#include "BLI_editVert.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_DerivedMesh.h"
 #include "BKE_utildefines.h"
-#include "BLI_editVert.h"
 
 #include "BLI_math.h"
 #include "MEM_guardedalloc.h"
index efdfdbc986ff7ff021d92e776500ba2c5e93e157..956972e8d5b924d8020b5b873d50ce541ef68409 100644 (file)
 #include <string.h>
 #include "BIF_gl.h"
 
-#include "BKE_cdderivedmesh.h"
-#include "BKE_global.h"
-#include "BKE_mesh.h"
-#include "BKE_paint.h"
-#include "BKE_utildefines.h"
-
 #include "BLI_blenlib.h"
 #include "BLI_edgehash.h"
 #include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_cdderivedmesh.h"
+#include "BKE_global.h"
+#include "BKE_mesh.h"
+#include "BKE_paint.h"
+#include "BKE_utildefines.h"
 
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
index b283120249e16de30b72675b054302a76add62a5..4b14e64ee27600a5aa9b6826f9886e0ad3fe0a96 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_cloth.h"
index b2d587151b1df67d771da1406172eb0a3e9949e1..8f028914ece8e974a3afc4e2e376f66bbe765775 100644 (file)
@@ -42,6 +42,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
index 1b3d100c3f82926260925e30618ea84bf0710ac6..282a055e04ce530c9709aa01d2d97dcc611b6cef 100644 (file)
 #include "DNA_color_types.h"
 #include "DNA_curve_types.h"
 
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_colortools.h"
 #include "BKE_curve.h"
 #include "BKE_fcurve.h"
 #include "BKE_utildefines.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
index b6e68a71bc9d2c1e31b49966b5bc115c29b0b29e..ad6b3b8f83765e0bc8efe09e51126e98df21dcfb 100644 (file)
@@ -39,6 +39,7 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_editVert.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
index 6dd3eb43e292d80bbfed9f011aa1a878d790ffe9..b5550768e55cf5b4809f25dd41f41074688e5630 100644 (file)
 #include <stdlib.h>  
 
 #include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"  
 #include "BLI_math.h"  
+#include "BLI_utildefines.h"
 
 #include "DNA_curve_types.h"  
 #include "DNA_material_types.h"  
index f7606a344c99bbe92765529271f5ec672f71602e..134b0e10280142203fcef9468dc80f8636f5709b 100644 (file)
@@ -46,6 +46,7 @@
 #include "BLI_linklist.h"
 #include "BLI_math.h"
 #include "BLI_mempool.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_customdata.h"
 #include "BKE_customdata_file.h"
index 5954ac1b02263cbed85b5e0c91fbb188cbd9ff29..ebc213448105a537069c3a9709570742027160fd 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "BLI_fileops.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_customdata_file.h"
 #include "BKE_global.h"
index 5fdb8f0206a0163be7a826e97dbc45bf678a7001..61865f5579c035d90e4a7b07aa073ada233c4349 100644 (file)
 #include <string.h>
 #include <math.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_winstuff.h"
+#include "BLI_utildefines.h"
+#include "BLI_ghash.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_windowmanager_types.h"
 
-#include "MEM_guardedalloc.h"
-
-#include "BLI_ghash.h"
-
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_effect.h"
@@ -61,6 +61,7 @@
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
+#include "BKE_utildefines.h"
 
 #include "depsgraph_private.h"
  
index 8c32733dd66d8a9daf47e1b95c288721dff4f084..53e33ee9bd847c64335213fcfb1ad63a1a91b143 100644 (file)
@@ -35,7 +35,6 @@
 
 #include "MEM_guardedalloc.h"
 
-
 #include "DNA_curve_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
@@ -46,6 +45,7 @@
 #include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_scanfill.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_global.h"
 #include "BKE_displist.h"
index 51f2203b525533fa83c44fcc7f75ac51f963adf7..aeec2a588c71b814d528abb722ead10bbf35e352 100644 (file)
@@ -59,6 +59,7 @@
 #include "BLI_listbase.h"
 #include "BLI_noise.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "PIL_time.h"
 
index d19226b24785b2373371a85df3678d696315328c..612ea84abe54d0bbd612b983833e060605e8ea25 100644 (file)
 #include "DNA_camera_types.h"
 #include "DNA_scene_types.h"
 
-#include "BKE_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_storage.h"
+#include "BLI_utildefines.h"
 
+#include "BKE_utildefines.h"
 #include "BKE_blender.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
index 4a596b079cf371eca0c87b0a5ad3379f189f3ad5..16d332c3bcb49215bd5678875518f9957b37abb6 100644 (file)
@@ -41,6 +41,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_fcurve.h"
 #include "BKE_animsys.h"
index ef89d39864a9823be4e1933992059ce2cd36fb3f..c4db31d732db1aca5314c8b96833bda82e11e832 100644 (file)
@@ -43,6 +43,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_customdata.h"
index 0376d75d65183fc72d8c801ae98bac612002f2da..40636fe59d15e0bc117bf327897d608e2a7cd227 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h" /* windows needs for M_PI */
+#include "BLI_utildefines.h"
 
 #include "BKE_fcurve.h"
 #include "BKE_idprop.h"
index ec63975a3c042c8fe7d9a5f35e3a9e6ba551b367..9a9d67a01f8dddfd72261ae834d9f48cd4fb8e54 100644 (file)
@@ -41,6 +41,7 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_vfontdata.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_packedFile_types.h"
 #include "DNA_curve_types.h"
@@ -49,9 +50,7 @@
 #include "DNA_object_types.h"
 
 #include "BKE_utildefines.h"
-
 #include "BKE_packedFile.h"
-
 #include "BKE_library.h"
 #include "BKE_font.h"
 #include "BKE_global.h"
index 80f26277689dc94af3f476a59e6021a3b39d8a60..4d02697920b9ff140ea466f6f7ed6fc5c886b99c 100644 (file)
@@ -33,8 +33,8 @@
 
 #include "MEM_guardedalloc.h"
 
-
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_gpencil_types.h"
 
index e125f3d4bd7394142f67ebb9537d486033cf33f2..3b82114fe353b96d9bc823eae79aa366c85c7f3a 100644 (file)
@@ -41,6 +41,7 @@
 #include "DNA_particle_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
index 30e4318e25631efc645176ccc4e80cc34d0bbec0..1df272fad3088a745ae3e6a948739e3b1a9efd2c 100644 (file)
@@ -40,6 +40,7 @@
 #include "DNA_world_types.h"
 #include "DNA_brush_types.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
 #include "BKE_icons.h"
index 70bfc96f0a2876677c250a28de91b13472c4770c..301588deaa2792f820f1d3181e50c38892547ca6 100644 (file)
@@ -60,6 +60,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_bmfont.h"
 #include "BKE_global.h"
index e19f36a2a0b17395fada9a13d7d30606559b408d..b810e028b62c27373db9d4ae8d970b0f34daf1fe 100644 (file)
@@ -37,6 +37,7 @@
 #include "BLI_threads.h"
 #include "BLI_math.h"
 #include "BLI_linklist.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_cloth.h"
 #include "BKE_collision.h"
index a040c27caa04aaab224ea1253765dc9413b53fa1..cc890683d7b2fd3d213786b6b09711d6e87d3900 100644 (file)
@@ -59,6 +59,7 @@
 #include "BLI_math.h" /* windows needs for M_PI */
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 
index 5a46d73201f8229a810d08a21cf9255c574650ad..a4958940b621056725e488648c40964d49e045e2 100644 (file)
@@ -39,6 +39,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
 #include "BLI_math_vector.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_key_types.h"
index 891d42c4a763d6f94843b7dabff4c13e56170fda..15761dce4b3a030de4b5bef91e04de774eedc0f2 100644 (file)
@@ -40,6 +40,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
index 08adfdc1960321f01a74a479ce4661c88715d769..6af7df67fa9029377667a4790adecb363d73f217 100644 (file)
@@ -67,9 +67,9 @@
 #include "DNA_world_types.h"
 #include "DNA_gpencil_types.h"
 
-
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_animsys.h"
index c8fb921285ce4d3c859c6a20855f9b3f2a800e82..887b1fe48a307f576432cdaec01a8ccff886c368 100644 (file)
@@ -45,6 +45,7 @@
 
 #include "BLI_math.h"          
 #include "BLI_listbase.h"              
+#include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
 #include "BKE_displist.h"
index 8658d7e482f340e62d3baade4453a2a2c1e3f717..bd1c009adc7c873350ef7d8cd5db231ce5bdf58e 100644 (file)
@@ -48,6 +48,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 
index 03fab0718da61bfd00f0b6d230bca56dde5aa355..15ececd0d4275eb698033bb504d923ba3f4613bc 100644 (file)
 #include "DNA_meshdata_types.h"
 #include "DNA_ipo_types.h"
 
+#include "BLI_blenlib.h"
+#include "BLI_editVert.h"
+#include "BLI_math.h"
+#include "BLI_edgehash.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_animsys.h"
 #include "BKE_main.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_object.h"
 #include "BKE_utildefines.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_editVert.h"
-#include "BLI_math.h"
-#include "BLI_edgehash.h"
-
-
 EditMesh *BKE_mesh_get_editmesh(Mesh *me)
 {
        return me->edit_mesh;
index f8fdc9e32a4e3313ee962635d3ba07b8bf91477e..cc3d6a9609261a46332fed510960dee3f8eb4e17 100644 (file)
 #include <math.h>
 #include <float.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 #include "DNA_meshdata_types.h"
 
-#include "MEM_guardedalloc.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_bmesh.h"
 #include "BKE_cloth.h"
index a3c13b36dcff84ffaeb6d59840da6369f73618f9..79de12e1ce8c3d957c49c904c1a1cd5049383bd1 100644 (file)
@@ -38,6 +38,7 @@
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
 #include "BLI_editVert.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
index 5996bdc9f9a9d143efe97aac733db8eb82812c51..fc7950e29c35ce9220e55048816f314802fea3df 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
 #include "DNA_anim_types.h"
index a2b6163321b4c889f4585075fee9cecec808de86..e564a32056fde4f54ea2329093540da762930694 100644 (file)
@@ -57,6 +57,7 @@
 #include "BLI_editVert.h"
 #include "BLI_math.h"
 #include "BLI_pbvh.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 
index c278bf3b3d2105ecc1ee032cdea26fb6153d5dbb..12ebaf7578a1d711713cff92a392dcd35667af2f 100644 (file)
@@ -47,6 +47,7 @@
 #include "DNA_packedFile_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
index 116ed3c8ef23d518b1c63f6bea83ec79c3ac2c34..945131b60b2c35b03a29e1613b3d76472694950b 100644 (file)
@@ -31,6 +31,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_brush_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 #include "BKE_brush.h"
 #include "BKE_library.h"
index d3a0cd5df7ce583ad5146d9747b588368594b7e0..27a19ecf1a5b529bd0d782df296061da1fb97e07 100644 (file)
 #include "DNA_scene_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_kdtree.h"
 #include "BLI_rand.h"
 #include "BLI_threads.h"
-#include "BLI_math.h"
 
 #include "BKE_anim.h"
 #include "BKE_animsys.h"
@@ -2477,7 +2478,7 @@ static void psys_thread_create_path(ParticleThread *thread, struct ChildParticle
        float orco[3], ornor[3], hairmat[4][4], t, dvec[3], off1[4][3], off2[4][3];
        float length, max_length = 1.0f, cur_length = 0.0f;
        float eff_length, eff_vec[3], weight[4];
-       int k, cpa_num, maxw=0;
+       int k, cpa_num;
        short cpa_from;
 
        if(!pcache)
@@ -2749,7 +2750,6 @@ static void *exec_child_path_cache(void *data)
 
 void psys_cache_child_paths(ParticleSimulationData *sim, float cfra, int editupdate)
 {
-       ParticleSettings *part = sim->psys->part;
        ParticleThread *pthreads;
        ParticleThreadContext *ctx;
        ParticleCacheKey **cache;
index 207a9b8f8395aa4f5530a996b46950071dbed2d4..646f8080b5c6428d8fe04cb17de5a34d9f1247c4 100644 (file)
@@ -63,6 +63,7 @@
 #include "BLI_listbase.h"
 #include "BLI_threads.h"
 #include "BLI_storage.h" /* For _LARGEFILE64_SOURCE;  zlib needs this on some systems */
+#include "BLI_utildefines.h"
 
 #include "BKE_main.h"
 #include "BKE_animsys.h"
@@ -3641,7 +3642,6 @@ static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra))
 static int emit_particles(ParticleSimulationData *sim, PTCacheID *pid, float UNUSED(cfra))
 {
        ParticleSystem *psys = sim->psys;
-       ParticleSettings *part = psys->part;
        int oldtotpart = psys->totpart;
        int totpart = tot_particles(psys, pid);
 
index 9ad00247dc2849b66fe69aaef07103fc584906a9..6f52803f6b26f381a56e456d62e023314e091a7d 100644 (file)
@@ -44,6 +44,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "PIL_time.h"
 
index 5df912c871d442c07f6206ae0ff6cc628e867a66..1dd27987cf8621b224a804044f67ce753e35856e 100644 (file)
@@ -29,6 +29,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_report.h"
 #include "BKE_global.h" /* G.background only */
index 9aeb9a89c9031ec58293f3b7a27860937f57476f..ded32de48d314b18ea92d57e50ace1f817f6d28f 100644 (file)
@@ -39,6 +39,8 @@
 #include <io.h>
 #endif
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_anim_types.h"
 #include "DNA_group_types.h"
 #include "DNA_object_types.h"
@@ -46,7 +48,9 @@
 #include "DNA_screen_types.h"
 #include "DNA_sequence_types.h"
 
-#include "MEM_guardedalloc.h"
+#include "BLI_math.h"
+#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_anim.h"
 #include "BKE_animsys.h"
@@ -69,9 +73,6 @@
 //XXX #include "BIF_previewrender.h"
 //XXX #include "BIF_editseq.h"
 
-#include "BLI_math.h"
-#include "BLI_blenlib.h"
-
 //XXX #include "nla.h"
 
 #ifdef WIN32
index b25c533ad4cef6652c8d10a37e3c933a7ba4d0ff..122e186bcd7272666f0dff808c4e84d5d365c085 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "DNA_sequence_types.h"
 #include "BKE_sequencer.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_mempool.h"
 #include <pthread.h>
index c11b51b9dd440bc27b5caa8516ed80904c3b6f4c..2d31cf7ba464b34efc3482c7134c606bffb1db9a 100644 (file)
@@ -35,6 +35,7 @@
 #include "PIL_dynlib.h"
 
 #include "BLI_math.h" /* windows needs for M_PI */
+#include "BLI_utildefines.h"
 
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
index 03d4f3da8893c9cfe1900bc13c05d2f6c941edd6..4a3c80afaa84c98229acf7e8f110bc681a7726b0 100644 (file)
 #include "DNA_object_types.h"
 #include "DNA_sound_types.h"
 
+#include "BLI_math.h"
+#include "BLI_fileops.h"
+#include "BLI_listbase.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BLI_threads.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_animsys.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "RNA_access.h"
 #include "RE_pipeline.h"
 
-#include "BLI_math.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"
index 16e4933332c460c24b015b1118b6ab717bba9068..ee39e639a99cbdeb14a4de48d63903f15a10e83d 100644 (file)
 #include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_editVert.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_shrinkwrap.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_lattice.h"
 #include "BKE_mesh.h"
 #include "BKE_subsurf.h"
 
-#include "BLI_editVert.h"
-#include "BLI_math.h"
-
-
 /* Util macros */
 #define OUT_OF_MEMORY()        ((void)printf("Shrinkwrap: Out of memory\n"))
 
index 7e39cdd1196b772f67b1f6095196695467e68cd3..a81f49ddc58855a67b4cfbd8936cbcd7910fd5b7 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_sketch.h"
 #include "BKE_utildefines.h"
index 9a0f278bcd0bee39f0ad0bc836cca59e29714013..41732ff37356011f17d89836e050ae0ca944464f 100644 (file)
@@ -48,6 +48,7 @@
 #include "BLI_edgehash.h"
 #include "BLI_kdtree.h"
 #include "BLI_kdopbvh.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_bvhutils.h"
 #include "BKE_cdderivedmesh.h"
index eb56331acfbf0d9f8b901bbd3dee0f2a84ea9b7b..6814f28f51c56ae512ceab9742898211217c24c0 100644 (file)
@@ -63,6 +63,7 @@ variables on the UI for now
 #include "DNA_meshdata_types.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_threads.h"
 
index 874fd0fef17a2cfd745ea1d51c17c0b0c07f5595..02b3d858a5fc7bc99eec13335db9e2ae93cf9886 100644 (file)
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_blenlib.h"
+#include "BLI_edgehash.h"
+#include "BLI_math.h"
+#include "BLI_memarena.h"
+#include "BLI_pbvh.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_cdderivedmesh.h"
 #include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_subsurf.h"
 #include "BKE_utildefines.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_edgehash.h"
-#include "BLI_math.h"
-#include "BLI_memarena.h"
-#include "BLI_pbvh.h"
-
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
index 44a8141adff52954996494b8d53ac7fdc5bbb389..8d73c0c32aeabb5fc595d2352231088773bb4aa6 100644 (file)
@@ -36,6 +36,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_constraint_types.h"
 #include "DNA_controller_types.h"
index 595b85955b86cc86d5b6878685d59d477d4e6379..11c0ce74b4aded4fcc9f168bee55321936526a93 100644 (file)
 
 #include "PIL_dynlib.h"
 
-
-
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_kdopbvh.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_key_types.h"
 #include "DNA_object_types.h"
index de708f216fd5bc756c3b88041a777c4ad3f848fa..0bfc0065b1ad29b5706844fa7c4b74113972db0b 100644 (file)
@@ -38,6 +38,7 @@
 #include "DNA_scene_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_global.h"
 #include "BKE_main.h"
index dd63c2664916802d5bd742c5002568a8fc2f1840..625a9168271cebfe1fb66578ce77ba238dbd34ac 100644 (file)
@@ -47,6 +47,8 @@
 
 #include "DNA_userdef_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BKE_report.h"
index 96505dae448576ddf2419650086b0d679d2753d5..46c0f767b5f1a14c47235ab770a72a4b73c3493b 100644 (file)
@@ -40,8 +40,6 @@ extern "C" {
 #include <stdlib.h>
 #include <string.h>
 
-#include "BKE_utildefines.h"
-
 #include "BLI_mempool.h"
 #include "BLI_blenlib.h"
 
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
new file mode 100644 (file)
index 0000000..c01a647
--- /dev/null
@@ -0,0 +1,218 @@
+/*
+ * $Id: BKE_utildefines.h 34147 2011-01-07 09:47:05Z campbellbarton $
+ *
+ * ***** 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 BLI_UTILDEFINES_H
+#define BLI_UTILDEFINES_H
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+
+#define ELEM(a, b, c)           ( (a)==(b) || (a)==(c) )
+#define ELEM3(a, b, c, d)       ( ELEM(a, b, c) || (a)==(d) )
+#define ELEM4(a, b, c, d, e)    ( ELEM(a, b, c) || ELEM(a, d, e) )
+#define ELEM5(a, b, c, d, e, f) ( ELEM(a, b, c) || ELEM3(a, d, e, f) )
+#define ELEM6(a, b, c, d, e, f, g)      ( ELEM(a, b, c) || ELEM4(a, d, e, f, g) )
+#define ELEM7(a, b, c, d, e, f, g, h)   ( ELEM3(a, b, c, d) || ELEM4(a, e, f, g, h) )
+#define ELEM8(a, b, c, d, e, f, g, h, i)        ( ELEM4(a, b, c, d, e) || ELEM4(a, f, g, h, i) )
+#define ELEM9(a, b, c, d, e, f, g, h, i, j)        ( ELEM4(a, b, c, d, e) || ELEM5(a, f, g, h, i, j) )
+#define ELEM10(a, b, c, d, e, f, g, h, i, j, k)        ( ELEM4(a, b, c, d, e) || ELEM6(a, f, g, h, i, j, k) )
+#define ELEM11(a, b, c, d, e, f, g, h, i, j, k, l)        ( ELEM4(a, b, c, d, e) || ELEM7(a, f, g, h, i, j, k, l) )
+
+/* shift around elements */
+#define SHIFT3(type, a, b, c) { type tmp; tmp = a; a = c; c = b; b = tmp; }
+#define SHIFT4(type, a, b, c, d) { type tmp; tmp = a; a = d; d = c; c = b; b = tmp; }
+
+/* min/max */
+#define MIN2(x,y)               ( (x)<(y) ? (x) : (y) )
+#define MIN3(x,y,z)             MIN2( MIN2((x),(y)) , (z) )
+#define MIN4(x,y,z,a)           MIN2( MIN2((x),(y)) , MIN2((z),(a)) )
+
+#define MAX2(x,y)               ( (x)>(y) ? (x) : (y) )
+#define MAX3(x,y,z)             MAX2( MAX2((x),(y)) , (z) )
+#define MAX4(x,y,z,a)           MAX2( MAX2((x),(y)) , MAX2((z),(a)) )
+
+#define INIT_MINMAX(min, max) { (min)[0]= (min)[1]= (min)[2]= 1.0e30f; (max)[0]= (max)[1]= (max)[2]= -1.0e30f; }
+
+#define INIT_MINMAX2(min, max) { (min)[0]= (min)[1]= 1.0e30f; (max)[0]= (max)[1]= -1.0e30f; }
+
+#define DO_MIN(vec, min) { if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0];      \
+                                                         if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1];   \
+                                                         if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; } \
+
+#define DO_MAX(vec, max) { if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0];         \
+                                                         if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1];   \
+                                                         if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; } \
+
+#define DO_MINMAX(vec, min, max) { if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
+                                                         if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
+                                                         if( (min)[2]>(vec)[2] ) (min)[2]= (vec)[2]; \
+                                                         if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
+                                                         if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; \
+                                                         if( (max)[2]<(vec)[2] ) (max)[2]= (vec)[2]; } \
+
+#define DO_MINMAX2(vec, min, max) { if( (min)[0]>(vec)[0] ) (min)[0]= (vec)[0]; \
+                                                         if( (min)[1]>(vec)[1] ) (min)[1]= (vec)[1]; \
+                                                         if( (max)[0]<(vec)[0] ) (max)[0]= (vec)[0]; \
+                                                         if( (max)[1]<(vec)[1] ) (max)[1]= (vec)[1]; }
+
+/* some math and copy defines */
+
+#ifndef SWAP
+#define SWAP(type, a, b)        { type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
+#endif
+
+#define ABS(a)                                 ( (a)<0 ? (-(a)) : (a) )
+
+#define AVG2(x, y)             ( 0.5 * ((x) + (y)) )
+
+#define FTOCHAR(val) ((val)<=0.0f)? 0 : (((val)>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*(val))+0.5f))
+#define FTOUSHORT(val) ((val >= 1.0f-0.5f/65535)? 65535: (val <= 0.0f)? 0: (unsigned short)(val*65535.0f + 0.5f))
+
+#define VECCOPY(v1,v2)          {*(v1)= *(v2); *(v1+1)= *(v2+1); *(v1+2)= *(v2+2);}
+#define VECCOPY2D(v1,v2)          {*(v1)= *(v2); *(v1+1)= *(v2+1);}
+#define QUATCOPY(v1,v2)         {*(v1)= *(v2); *(v1+1)= *(v2+1); *(v1+2)= *(v2+2); *(v1+3)= *(v2+3);}
+#define LONGCOPY(a, b, c)      {int lcpc=c, *lcpa=(int *)a, *lcpb=(int *)b; while(lcpc-->0) *(lcpa++)= *(lcpb++);}
+
+
+#define VECADD(v1,v2,v3)       {*(v1)= *(v2) + *(v3); *(v1+1)= *(v2+1) + *(v3+1); *(v1+2)= *(v2+2) + *(v3+2);}
+#define VECSUB(v1,v2,v3)       {*(v1)= *(v2) - *(v3); *(v1+1)= *(v2+1) - *(v3+1); *(v1+2)= *(v2+2) - *(v3+2);}
+#define VECSUB2D(v1,v2,v3)     {*(v1)= *(v2) - *(v3); *(v1+1)= *(v2+1) - *(v3+1);}
+#define VECADDFAC(v1,v2,v3,fac) {*(v1)= *(v2) + *(v3)*(fac); *(v1+1)= *(v2+1) + *(v3+1)*(fac); *(v1+2)= *(v2+2) + *(v3+2)*(fac);}
+#define VECSUBFAC(v1,v2,v3,fac) {*(v1)= *(v2) - *(v3)*(fac); *(v1+1)= *(v2+1) - *(v3+1)*(fac); *(v1+2)= *(v2+2) - *(v3+2)*(fac);}
+#define QUATADDFAC(v1,v2,v3,fac) {*(v1)= *(v2) + *(v3)*(fac); *(v1+1)= *(v2+1) + *(v3+1)*(fac); *(v1+2)= *(v2+2) + *(v3+2)*(fac); *(v1+3)= *(v2+3) + *(v3+3)*(fac);}
+
+#define INPR(v1, v2)           ( (v1)[0]*(v2)[0] + (v1)[1]*(v2)[1] + (v1)[2]*(v2)[2] )
+
+/* some misc stuff.... */
+#define CLAMP(a, b, c)         if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c)
+#define CLAMPIS(a, b, c) ((a)<(b) ? (b) : (a)>(c) ? (c) : (a))
+#define CLAMPTEST(a, b, c)     if((b)<(c)) {CLAMP(a, b, c);} else {CLAMP(a, c, b);}
+
+#define IS_EQ(a,b) ((fabs((double)(a)-(b)) >= (double) FLT_EPSILON) ? 0 : 1)
+
+#define IS_EQT(a, b, c) ((a > b)? (((a-b) <= c)? 1:0) : ((((b-a) <= c)? 1:0)))
+#define IN_RANGE(a, b, c) ((b < c)? ((b<a && a<c)? 1:0) : ((c<a && a<b)? 1:0))
+#define IN_RANGE_INCL(a, b, c) ((b < c)? ((b<=a && a<=c)? 1:0) : ((c<=a && a<=b)? 1:0))
+
+
+/* This one rotates the bytes in an int64, int (32) and short (16) */
+#define SWITCH_INT64(a) { \
+       char s_i, *p_i; \
+       p_i= (char *)&(a); \
+       s_i=p_i[0]; p_i[0]=p_i[7]; p_i[7]=s_i; \
+       s_i=p_i[1]; p_i[1]=p_i[6]; p_i[6]=s_i; \
+       s_i=p_i[2]; p_i[2]=p_i[5]; p_i[5]=s_i; \
+       s_i=p_i[3]; p_i[3]=p_i[4]; p_i[4]=s_i; }
+
+               #define SWITCH_INT(a) { \
+       char s_i, *p_i; \
+       p_i= (char *)&(a); \
+       s_i=p_i[0]; p_i[0]=p_i[3]; p_i[3]=s_i; \
+       s_i=p_i[1]; p_i[1]=p_i[2]; p_i[2]=s_i; }
+
+#define SWITCH_SHORT(a)        { \
+       char s_i, *p_i; \
+       p_i= (char *)&(a); \
+       s_i=p_i[0]; p_i[0]=p_i[1]; p_i[1]=s_i; }
+
+
+/* Warning-free macros for storing ints in pointers. Use these _only_
+ * for storing an int in a pointer, not a pointer in an int (64bit)! */
+#define SET_INT_IN_POINTER(i) ((void*)(intptr_t)(i))
+#define GET_INT_FROM_POINTER(i) ((int)(intptr_t)(i))
+
+/* Macro to convert a value to string in the preprocessor
+ * STRINGIFY_ARG: gives the defined name in the string
+ * STRINGIFY: gives the defined value. */
+#define STRINGIFY_ARG(x) #x
+#define STRINGIFY(x) STRINGIFY_ARG(x)
+
+/* useful for debugging */
+#define AT __FILE__ ":" STRINGIFY(__LINE__)
+
+/* UNUSED macro, for function argument */
+#ifdef __GNUC__
+#  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
+#else
+#  define UNUSED(x) UNUSED_ ## x
+#endif
+
+
+/*little macro so inline keyword works*/
+#if defined(_MSC_VER)
+#  define BM_INLINE static __forceinline
+#elif defined(__GNUC__)
+#  define BM_INLINE static inline __attribute((always_inline))
+#else
+/* #warning "MSC/GNUC defines not found, inline non-functional" */
+#  define BM_INLINE static
+#endif
+
+
+/* BKE_assert(), default only to print
+ * for aborting need to define WITH_ASSERT_ABORT
+ */
+#if !defined NDEBUG
+#  ifdef WITH_ASSERT_ABORT
+#    define _dummy_abort abort
+#  else
+#    define _dummy_abort() (void)0
+#  endif
+#  ifdef __GNUC__ /* just want to check if __func__ is available */
+#    define BKE_assert(a) \
+do { \
+       if (0 == (a)) { \
+               fprintf(stderr, \
+                       "BKE_assert failed: %s, %s(), %d at \'%s\'\n", \
+                       __FILE__, __func__, __LINE__, STRINGIFY(a)); \
+               _dummy_abort(); \
+       } \
+} while (0)
+#  else
+#    define BKE_assert(a) \
+do { \
+       if (0 == (a)) { \
+               fprintf(stderr, \
+                       "BKE_assert failed: %s, %d at \'%s\'\n", \
+                       __FILE__, __LINE__, STRINGIFY(a)); \
+               _dummy_abort(); \
+       } \
+} while (0)
+#  endif
+#else
+#  define BKE_assert(a) (void)0
+#endif
+
+#endif // BLI_UTILDEFINES_H
index dcd66cc9b7ef3b02240bfe36e2868dd3d45a4a1d..35acbe5e831c87da4e205d2ae0302d29fdf6c0cc 100644 (file)
@@ -121,6 +121,7 @@ set(SRC
        BLI_storage_types.h
        BLI_string.h
        BLI_threads.h
+       BLI_utildefines.h
        BLI_uvproject.h
        BLI_vfontdata.h
        BLI_voxel.h
index b9df4b309df81458844f1f5459af3342218728ea..ff41f76a1f9a00d8f5541602ef4d60e0381d7ae5 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 #include "BLI_args.h"
 #include "BLI_ghash.h"
 
index 729f5309523b05626a4d252b1429f4353ce44589..a8ca828aa66bfea92c38e6ae3ddc7c9792e4248d 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLO_sys_types.h" // for intptr_t support
 /***/
index 8c0be971682ca7449a84388bb00e8aca842d7e70..85520c95829a8c542aab56977776d82b1fe5f883 100644 (file)
@@ -30,6 +30,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 #include "BLI_kdopbvh.h"
index f8421fa7e7a4d1d857a1c8fa0528902bcff972d8..39f44089f6e6d98a6b380a29fe42ba924f64bbca 100644 (file)
@@ -54,6 +54,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_bpath.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_global.h"
 #include "BKE_image.h" /* so we can check the image's type */
index fc41839c303396f3c7e551df2c9741790675b8a4..94cd162a961c9ca25276149ffd2028ad9c246100 100644 (file)
@@ -46,7 +46,8 @@
 
 #include "BLI_vfontdata.h"
 #include "BLI_blenlib.h"
-#include "BLI_math.h"  
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 //XXX #include "BIF_toolbox.h"
 
index b324cb4616a4eb3f86506a4f06719641a1ddffdb..95beca0e97bc791fa2f5e9daf96b409b7c969d89 100644 (file)
@@ -31,6 +31,7 @@
 #include "BLI_graph.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 
index 2a420b78fda8edf5e4bf47d506c21581c2f77548..98ba9b0b41f67097c29fa26573ef0fea9354ff31 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "BLI_math.h"
 #include "BLI_memarena.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 
index 4cbd93ce0a1c0a4c219a49e5e30b1e95851eb082..0e46a9df4fcd267f82e2163d802170a2fc3dcbe0 100644 (file)
@@ -43,6 +43,7 @@
 #include "BLI_string.h"
 #include "BLI_storage.h"
 #include "BLI_storage_types.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_blender.h"       // BLENDER_VERSION
index 9d126a4a931c693c5fecbb391bce3154c6d981b0..8727fab708640e5da2e847afd8078c2091aef74a 100644 (file)
@@ -27,6 +27,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_pbvh.h"
 
index 2b04a49e848d3d7b3642b10d9cd9c14b2222bf78..64f7d7904b10e669af96e971e780cac650f810f3 100644 (file)
@@ -27,6 +27,7 @@
  */
 
 #include "BLI_voxel.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 
index 8b16e11f25e1db4da049bbaee4962c97a0bba6bf..bc7f674d6ba15bc9a51129d70bd02342ca05f8a2 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_linklist.h"
 
@@ -49,6 +50,7 @@
 #include "BKE_library.h" // for free_main
 #include "BKE_idcode.h"
 #include "BKE_report.h"
+#include "BKE_utildefines.h"
 
 #include "BLO_readfile.h"
 #include "BLO_undofile.h"
index 38476b0bcc22cbd8c7e7393fd331061f809994c0..f3bd91d12ed6d73d67039f561dce54e2e23ac2ff 100644 (file)
@@ -88,6 +88,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_anim.h"
 #include "BKE_action.h"
index f1e1d13a2d6d00b65fc2a274157f54150f20a2d7..76bc2577183d52328a2d66eb6a620d5c0b4a56b3 100644 (file)
@@ -129,6 +129,7 @@ Any case: direct data is ALWAYS after the lib block
 #include "BLI_blenlib.h"
 #include "BLI_linklist.h"
 #include "BLI_bpath.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_action.h"
 #include "BKE_blender.h"
index f7ee0dbd16db72f1579ff921ad10a66321002bb9..6dbffd5232c0ef18a03fc59d5611612d5849a047 100644 (file)
 
 #include "COLLADASaxFWLLoader.h"
 
+#include "BLI_listbase.h"
+#include "BLI_math.h"
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_main.h"
 #include "BKE_library.h"
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
 #include "BKE_image.h"
 
-#include "BLI_listbase.h"
-#include "BLI_math.h"
-#include "BLI_string.h"
-
 #include "DNA_camera_types.h"
 #include "DNA_lamp_types.h"
 
index 7322eb8ac139031fa466600b1adf7746eba20c7c..298fd9102ec760ad769fba2d707bc40f086fe04c 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_world_types.h"
 
 #include "RNA_access.h"
+
 #include "BKE_curve.h"
 #include "BKE_key.h"
 #include "BKE_context.h"
+#include "BKE_utildefines.h" /* FILE_MAX */
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
index d3dd808894959663d9d432c41fd27526adafe817..319f80404b4b386c312171d9e81e06454a4a5ffa 100644 (file)
@@ -32,6 +32,8 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
index 02d69fd61faf480d3f7c20a468208ad8a55a50fc..340101612b945a4ea549c0413aca99aeeccbed1e 100644 (file)
@@ -38,6 +38,7 @@
 #include "DNA_sequence_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
 #include "BKE_action.h"
index e3669dd1077810fd6a886da770b770b03af37e4a..c61adcd6518e6a3cc452a5a038614dc744262f19 100644 (file)
@@ -69,6 +69,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
 #include "BKE_animsys.h"
@@ -81,6 +82,7 @@
 #include "BKE_material.h"
 #include "BKE_node.h"
 #include "BKE_sequencer.h"
+#include "BKE_utildefines.h"
 
 #include "ED_anim_api.h"
 
index 56161f4bfa0371177e72ba65280338c11ba819c2..34eb6524484630e2629cf732b0945e897dc7f418 100644 (file)
@@ -37,6 +37,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 
index 4e77e15b2822ac9113ad39f95496ec4f9fe98459..80b026ddd6ecbfdeadb376156cdc75f70a548e54 100644 (file)
@@ -38,6 +38,7 @@
 #include "RNA_enum_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_fcurve.h"
index ba5a53e6d7a27dd4dd97bdc8946914b8093f5a03..6b0fa30b09646920b933d6c28ff293eb479ed204 100644 (file)
@@ -31,6 +31,8 @@
 
 #include "BLO_sys_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
 
index 902fa2f789f9ffeb2ec84b0f80d2c64fb55d939c..c6c333755b0a04a49ebc06598d55aab964687164 100644 (file)
@@ -32,6 +32,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 
index 7642f63b5310f6a6b00e8d6aff0f983599e7f1ce..b47fea58633e6d50f1215ca8f0243c0f1ec0afcc 100644 (file)
@@ -43,6 +43,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_fcurve.h"
index 834a1028c6a3232aa80f7ed9a096a310db800004..6d0fe4c78fac5ff41c5100fff651dc79ec75f89c 100644 (file)
@@ -39,6 +39,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_dlrbTree.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index d675bf673cdd5977e8f2e36e5aaaceec227572af..4ba09a3440768a61945b0056b95ee83c28282db0 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index e8509a1bbc295ed6f5b8ad75c93a518f698cf9a7..92fce2a77e55ff2148d77ba5ebbd27bd197b52e3 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
index e31af91cce0078676e0e0877571ab97a21995524..726c898e8438776679ef6f761b0046cca536beb1 100644 (file)
@@ -38,6 +38,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index 433abc7d3d15f1102001e5e8c565a9f88697eedd..51b00cc0086e1bb82d13c872acba35fdd70754c6 100644 (file)
@@ -38,6 +38,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_scene_types.h"
index 6d677e2f89e555a7c9b5a200c8fb2ab31a5f2c4b..935331e3263f5f9c70c0c96f2b8ffc4f44117671 100644 (file)
@@ -44,6 +44,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_editVert.h"
 #include "BLI_ghash.h"
 
index 6abdd85bf71e66f0f68cd6e47593acdf92a6807c..23b6af9ba73d6377792e48a54f5ab97fe17db22b 100644 (file)
@@ -39,6 +39,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_graph.h"
+#include "BLI_utildefines.h"
  
 #include "BKE_utildefines.h"
 
index 3e8c5c3ebb2fe3f6832dccf4d2989798a862ec6a..e9d0645ceba225925be9f02f8e9d0736596d858f 100644 (file)
@@ -41,6 +41,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_editVert.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_graph.h"
 #include "BLI_rand.h"
index 121a7d6987be9d2771fae813d58f723fb6ec53b2..7a5c14b1dabcf6bf30cee9b5df020e0db3af94c3 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_graph.h"
 #include "BLI_ghash.h"
 
index 3d8e87d9e79758c22b7c4e4ce9007375fb5f2d0d..8946291fce54de456e9e780c9a3de2656639c0f7 100644 (file)
@@ -41,6 +41,7 @@
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
 #include "BLI_memarena.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_modifier.h"
index c51621080c5b3a452888779929d965095d8a6c15..47e5f734f867a32b5c03d2bfb3da8d25d8beb3b4 100644 (file)
@@ -38,6 +38,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
 #include "BLI_dlrbTree.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index 6756691c506afd2e83404588b8180f2be25dcf34..7b1b3b6c5c8a40790a826a258c9bd49fda7379ee 100644 (file)
@@ -38,6 +38,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
 #include "BLI_dlrbTree.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index 71b6be42900e8051ce1f4c84631bc63de1c1759b..d5994e24cd69dc0223863828fa4d6d323ea86b2d 100644 (file)
@@ -38,6 +38,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
 #include "BLI_dlrbTree.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index 21431bb40b5c89ac7f771478f6c7fe37d972da56..2ce6da9b04cc053cd19278bf526b8fb3f5bd0749 100644 (file)
@@ -36,6 +36,7 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
index e896cccd1b347902f7542053e010f42b90680eee..780dc8827c4a3794277ea210a50b1e36d243a633 100644 (file)
@@ -40,6 +40,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_editVert.h"
 #include "BLI_edgehash.h"
 #include "BLI_ghash.h"
index 93cf02c4cb1e28596a418602a076f17a882926c7..73db7b1a377ec043ea064ea9da7bf75f7c4d2129 100644 (file)
@@ -48,6 +48,7 @@
 #include "BLI_math.h"
 #include "BLI_dynstr.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
 #include "BKE_context.h"
index 86a0eeefb0056434f016ae079b382d5c0d4ab8d0..70a41ae74325581741742865891cb96a368c39ef 100644 (file)
@@ -40,6 +40,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
index 29cdfffa5514ac8791768c7dbbebf206768a6e32..829436380a5c5c40b93efcd8611a2298fcc43cd8 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_gpencil_types.h"
 #include "DNA_scene_types.h"
index e0d257ca3bfc8abc7bc4cb388df03a5f0ce5d453..e7660659dfa378ce464bb757111f0b180dfaed60 100644 (file)
@@ -37,6 +37,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_curve_types.h"
 #include "DNA_object_types.h"
index 11a15fd8afc4850c08516e823950860f36255b78..d5cdb552439bceb547b9da0675be5ab679ac19f7 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_gpencil.h"
 #include "BKE_context.h"
index 5860bdaed2f4c7d92f33034e6edd18e985aea93c..d74a907d78507d626f57170c5c4c17b9a0c36fb0 100644 (file)
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_library.h"
 #include "BKE_unit.h"
+#include "BKE_utildefines.h" /* FILE_MAX */
 
 #include "BIF_gl.h"
 
index 65261371329532a08c853ab7f96a8e362afc45a4..e3321edda8055bc0247f4543885b8bd355ca57cd 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "BLI_math.h"
 #include "BLI_rect.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_colortools.h"
 #include "BKE_texture.h"
index 0733652a75f49f350cdc12a537b5b03c4fe9981b..0dd135c9ba4f650cdced704a99c85641a697e985 100644 (file)
@@ -38,6 +38,8 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 #include "PIL_time.h"
 
 #include "BKE_colortools.h"
index f8aa335b9293d12342ecdab9b43b256df98d94d1..7d2f8e0d32aa5b66d80180de41c7843da4417bac 100644 (file)
@@ -43,6 +43,7 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_storage_types.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_brush_types.h"
 #include "DNA_object_types.h"
index 46dfd34d2ba5f5b9b3a36c0fb37bad81a66bd0e2..f39a0204dcb1108d69059c948e431c598a4a0bc3 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index 1c2b0f9e7f3af8081229234ccb5d3d36e577f47b..95c52d20c375f7f99ef02f659c26b1005924eb39 100644 (file)
@@ -29,7 +29,6 @@
 #include <math.h>
 #include <string.h>
 
-
 #include "MEM_guardedalloc.h"
 
 #include "DNA_scene_types.h"
@@ -38,6 +37,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math_color.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index 88eabf7a8a2d694f4998e0a77ceb0483a3dd7561..2b6c18c56357260d28479a9d0749eefd26bdee6b 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_userdef_types.h"
 
index 1da50e0a9bba4fa048947cae7f43bfb108625bd0..571a48a41000cb3cf8a7643b9f747c9c0071f6c7 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
 
index 71b9616c58db0b1179cd9cae52fc0516762a256d..69e866d9c1c366e1f75842f5cd36961d5529a012 100644 (file)
@@ -32,6 +32,7 @@
 #include "DNA_userdef_types.h"
 
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
 #include "BKE_colortools.h"
index 2f7e0beeba6fb19df4e2662e65c16968ceee96ba..1a31c7110f147e7942701e3ab1211ecc90633ff1 100644 (file)
@@ -30,6 +30,8 @@
 
 #include "DNA_object_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_utildefines.h"
 
index 1ce045ced74b5bde69010749cf82c6884b969464..cf29794434eb4547ddf88b073e813a9d7739ea11 100644 (file)
@@ -36,6 +36,7 @@
 #include "BLI_listbase.h"
 #include "BLI_rect.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
index 6500ce041baba055600d9851a39f1907d91ab4ff..a096d39ea94e30a96be4ddb19d13d0637e218f23 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "MEM_guardedalloc.h"
 
-
 #include "DNA_curve_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_screen_types.h"
@@ -44,7 +43,7 @@
 #include "DNA_windowmanager_types.h"
 
 #include "BLI_blenlib.h"
-
+#include "BLI_utildefines.h"
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
index 628a7cbab51f86f7b4fe0316952851d496e7166b..b5c89d6dc73004ca3acddb511a6c1d00869dba6b 100644 (file)
@@ -36,6 +36,7 @@
 #include "DNA_userdef_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index af63b9cf37eb2f97557d0bdf2874563327460c75..fa4b039bb62d6490bef189f2ba7bcb3576a9f169 100644 (file)
@@ -32,6 +32,7 @@
 #include "DNA_userdef_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 
index 945313a71e839f20a582837543d380673b6efe38..2a391f7bbaf94450ae4d4aa4503cfa6f6eafcf73 100644 (file)
@@ -36,6 +36,7 @@
 #include "BLI_heap.h"
 #include "BLI_edgehash.h"
 #include "BLI_editVert.h"
+#include "BLI_utildefines.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
index b749d60e8125d03af735b9b7f2cc1c635f4cfc92..d010ab190488212b3f44bc2808fbf2fcd306dd31 100644 (file)
@@ -43,6 +43,7 @@
 #include "BLI_editVert.h"
 #include "BLI_dynstr.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_context.h"
index b826c984304ae7451e57a69328bf835b2fca932b..d9db1e99bfa68d2f5167be467b6e4f72b2b8f1e8 100644 (file)
@@ -44,6 +44,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_editVert.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
index e50f65256a74aee9ce5c8d365df707ba6865b649..46ece1a083a417e2d11243f94044392fec803bcd 100644 (file)
@@ -48,6 +48,7 @@ editmesh_lib: generic (no UI, no menus) operations/evaluators for editmesh data
 #include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_edgehash.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_customdata.h"
 #include "BKE_context.h"
index 2e17cb40fcbdc89f123a1039f11cc47f243927e8..4ffd458d66c336cc80e889a0a2278ff28a7325b1 100644 (file)
@@ -46,12 +46,14 @@ editmesh_loop: tools with own drawing subloops, select, knife, subdiv
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_editVert.h"
 #include "BLI_ghash.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
+#include "BKE_array_mallocn.h"
 
 #include "PIL_time.h"
 
index 6be4234b072f0358de17f06861f3effa97824d2f..54a3adc5da372420de6c23b119d93c05f47df636 100644 (file)
@@ -38,7 +38,6 @@ editmesh_mods.c, UI level access, no geometry changes
 
 #include "MEM_guardedalloc.h"
 
-
 #include "DNA_material_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
@@ -49,6 +48,7 @@ editmesh_mods.c, UI level access, no geometry changes
 #include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_displist.h"
index b4e1e5a4325ca4c59b5470b8a806d415c56a2b97..1f6fa9b0fb685a02e2707de30c0cce07dc4d88d7 100644 (file)
@@ -52,6 +52,7 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
 #include "BLI_ghash.h"
index af7285c548ac683ae504aa7a0d794745da763e4f..42df009bb164770acdbd98b6e0eb8c6d8751a10a 100644 (file)
@@ -46,6 +46,7 @@
 #include "BLI_dynstr.h" /*for WM_operator_pystring */
 #include "BLI_editVert.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_blender.h"
 #include "BKE_context.h"
@@ -54,6 +55,7 @@
 #include "BKE_modifier.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
+#include "BKE_array_mallocn.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h" /* for paint cursor */
index e8e77911a655a55fd556b044067a74b3b236f359..7dd5196d32d77f8a2f6c352679e7b9750d122f8b 100644 (file)
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
 
+#include "BLI_math.h"
+#include "BLI_editVert.h"
+#include "BLI_edgehash.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_displist.h"
 #include "BKE_mesh.h"
 #include "BKE_report.h"
 
-#include "BLI_math.h"
-#include "BLI_editVert.h"
-#include "BLI_edgehash.h"
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 
index 6cf0fe0874ec6a07639515a263feeda1668bb464..3e7b76044484e0ed2fe0151cf7a0b3c319805cdf 100644 (file)
@@ -46,6 +46,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 #include "BLI_editVert.h"
 #include "BLI_ghash.h"
 #include "BLI_rand.h" /* for randome face sorting */
index 2ec225777cccff0e9fe068b8c6431b8501dd893f..b73f73820c729e586e611100896ae12ab473111f 100644 (file)
@@ -35,6 +35,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
index 696d8bc2c6fa34a3cffd3cd690353804ef925bf8..2656db0ea9fca8f52d93aa4bddd154583394f5e7 100644 (file)
@@ -43,6 +43,7 @@
 
 #include "BLI_math.h"
 #include "BLI_listbase.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_anim.h"
 #include "BKE_animsys.h"
index 4af2e00ef69b59bbf5f220da917b779b2d416160..0b3e116d2666080c2d5bd216cf8fb105265d1ae0 100644 (file)
@@ -42,6 +42,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_blender.h"
 #include "BKE_context.h"
index 5afba182cc03a0677392534d58c74f7549ba5338..5076fec4fa322db1b4d0089b407b8de4443e977b 100644 (file)
@@ -35,6 +35,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_constraint_types.h"
 #include "DNA_curve_types.h"
index 7afb298367675b256daea8e568830059b4a1a28e..1465c231f4133e985248a62a27e3329f7fbc3b54 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_editVert.h"
 #include "BLI_ghash.h"
 #include "BLI_rand.h"
index 3b504995e6ab8ee81f649d8cb62bf366ed7fe933..c26affc24a253d84838ef87a1db10031d4a85c2d 100644 (file)
@@ -29,8 +29,8 @@
 
 #include <string.h>
 
-
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_group_types.h"
 #include "DNA_object_types.h"
index e04ec43dace29637ac7345a73488c1875462db71..92a53b834b08bc24f4b9b121fbcdd0a3476171cf 100644 (file)
@@ -34,6 +34,7 @@
 #include "BLI_editVert.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_curve_types.h"
 #include "DNA_lattice_types.h"
index 2eefad06d2fb82acb0762b9bbb78ab62e7c47629..1f70dd84d9410bf5dff6b0b3b3115d0ea973ce18 100644 (file)
@@ -31,6 +31,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
+
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
@@ -46,8 +49,6 @@
 #include "BKE_lattice.h"
 #include "BKE_mesh.h"
 
-#include "BLI_listbase.h"
-
 #include "ED_screen.h"
 #include "ED_view3d.h"
 #include "ED_util.h"
index ef6f450f2f447f45cae2ea549393333edc51a859..13b92ed2646ddfa3e128812b9e6632ccf5dc1357 100644 (file)
@@ -43,6 +43,7 @@
 #include "BLI_string.h"
 #include "BLI_path_util.h"
 #include "BLI_editVert.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_curve.h"
 #include "BKE_context.h"
index 221d12119302ee116e4564fcc6078a11fe1764b6..2c0293b3a794e6a4d795e9f648d034ebd8425f08 100644 (file)
 #include <stdlib.h>
 #include <math.h>
 
-
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 
index 260f2bca7f6f0de8edd22b6ea5f94ca1ee12ac6c..6ddd7475f332d744068c9b786e164def3aacd013 100644 (file)
@@ -47,6 +47,7 @@
 #include "BLI_editVert.h"
 #include "BLI_listbase.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_action.h"
 #include "BKE_animsys.h"
index 265fd84d6daeae249591ffacefc35262a7ec782e..3cb20ebbac0bfca7ccdc7b41815e1cac63499ab8 100644 (file)
@@ -42,6 +42,7 @@
 #include "BLI_listbase.h"
 #include "BLI_rand.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_group.h"
index 125e3c68b093128306c9ee0dc56a8445660aff7f..d8e54a735008a3c06d3bb110c9306f54a5005e98 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_curve_types.h"
 #include "DNA_key_types.h"
index 1792cabd5f62fbd7bd55f54b4f1f7949d046d4a6..60ea557d36d8442f3fdad74f9faa40db84b88ff3 100644 (file)
@@ -39,6 +39,7 @@
 #include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_listbase.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
index 410ad9394a35b2c63d3872724da910284be22f23..53e74cc9ae046405ab7221bc6be01b760c5403db 100644 (file)
@@ -45,6 +45,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_customdata.h"
index 84d9c0725bfba27be34a4e0365ea63d2209bb3b9..90e387a79c232dcc770a25ac62322b728f3cf19d 100644 (file)
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_boids.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_particle.h"
 
-#include "BLI_listbase.h"
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
 #include "RNA_define.h"
index 238ace11c0dc8ce865a47622b929466c9fafdc70..87ba66cd827e79f2529519bec3216b1c38cf346f 100644 (file)
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 
+#include "BLI_math.h"
+#include "BLI_blenlib.h"
+#include "BLI_dynstr.h"
+#include "BLI_kdtree.h"
+#include "BLI_rand.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_DerivedMesh.h"
 #include "BKE_depsgraph.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_pointcache.h"
 
-#include "BLI_math.h"
-#include "BLI_blenlib.h"
-#include "BLI_dynstr.h"
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-
-
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
index 6e0ac82ebf333e48d540a067a191f24cb3bd366e..f86314afafe7686db4ad81a6813a35c4c15f1807 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "BLI_math.h"
 #include "BLI_listbase.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
index da8e7e063f476ee52a7c6d0057fa25948c7c270c..4e08dd49703889a92928e3c83bef22eb489b1d01 100644 (file)
@@ -53,6 +53,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
 #include "BKE_armature.h"
index e0fc0d7318d060685013a94287e777bc2f3a946f..7b5312079359dc63c5747f03328444ff2f6adb43 100644 (file)
@@ -31,6 +31,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 #include "DNA_scene_types.h"
 
 #include "BKE_context.h"
 #include "BKE_scene.h"
 #include "BKE_utildefines.h" 
 
-#include "BLI_blenlib.h"
-
 #include "ED_particle.h"
 
-
 #include "WM_api.h"
 #include "WM_types.h"
 
index 96e48631b09012e3a082545996adaf13632e32a3..96994ab1df43c33da1e3caf83522e7ef68bb19cf 100644 (file)
@@ -34,6 +34,7 @@
 #include "BLI_math.h"
 #include "BLI_threads.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_scene_types.h"
 
index df5576c778d92d2dd8662bdd347d69d244068d9a..8a4a0433eb839cb61c2d6b299869e01edd35202c 100644 (file)
@@ -36,6 +36,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
 #include "BLI_dlrbTree.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
index 10f5ed20b0c784ada07dda908f88f4076522ca60..d635a799ec1c5a5e4f9f50541bf09678973672b6 100644 (file)
@@ -45,6 +45,7 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_world_types.h"
 #include "DNA_camera_types.h"
index 24b521dcabcfdffbe8fb0c115e15934de2e3ee6c..44fce4819f319394239ac1e299a502041cca2274 100644 (file)
 #include "DNA_space_types.h"
 #include "DNA_world_types.h"
 
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_editVert.h"
+#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_animsys.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-#include "BLI_editVert.h"
-#include "BLI_listbase.h"
-
 #include "GPU_material.h"
 
 #include "RNA_access.h"
index 328cfb1254c93ff95dc02f50527b159c5e08af3e..5ea5fe06c466ce6c2e22394e397f8359a27db5b5 100644 (file)
@@ -36,6 +36,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index 6a9fc1489f141dbbdad6f0434e8ff221732b8b74..9b3a51805e940ff364f8c54228271eab348fba6d 100644 (file)
@@ -32,7 +32,8 @@
 
 #include "DNA_vec_types.h"
 
-#include "BKE_utildefines.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_colortools.h"
 
 #include "BLI_math.h"
index 82f5f2597ddc84e91dbcbaee677da9e83b886b4a..949ca1d31269df6c91e9d0b436f4388b37568923 100644 (file)
@@ -33,6 +33,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 #include "BKE_context.h"
 #include "BKE_object.h"
index 7c30d113132cefb447a760a49567b08ffb5caf1c..376e70f6ea2da4d9f3b06dc424d528a88c305ee1 100644 (file)
@@ -34,6 +34,7 @@
 #include "DNA_userdef_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index 8a515f814114d81865053bbd88591c8c76f1fdeb..d891b0252415c063dd7dd583a6c0f15449248372 100644 (file)
@@ -33,6 +33,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
 #include "BLI_dlrbTree.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_armature_types.h"
 #include "DNA_lattice_types.h"
index d4235a09d37172e5a82f261d48d049b11d7350af..1fbcd7e61fd03133076336c4247e5e83b8eb14f3 100644 (file)
@@ -31,6 +31,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
index bbfa909b80785f9c7a6d4b68c63929e662a1c896..82c2f614af1691b80b043c7ab40413bdde7d7c7a 100644 (file)
 #include "BLI_dynstr.h"
 #include "BLI_linklist.h"
 #include "BLI_memarena.h"
-#include "PIL_time.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
+
+#include "PIL_time.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
index 8b010b6dcdbd4f953684e0f18a6f401b878939a3..4bf8b72ac8a86db3b302b3e37ed97c377a5e13ee 100644 (file)
@@ -19,6 +19,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include "BLI_utildefines.h"
+
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
index d410cea8f1307f67430cdaa17fe21fc4a9504034..bbd5dae797e72c4bc4809a3d8c135ccb2b46e75d 100644 (file)
@@ -28,6 +28,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_brush_types.h"
@@ -41,9 +44,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "BLI_math.h"
-
-
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
index 643e2cd69154d4d97af1a95b58ace88067f8b4f5..76cf24d43396aa1da52a9c97440619e5b9b69f28 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_userdef_types.h"
-
 #include "BLI_listbase.h"
+#include "BLI_utildefines.h"
+
+#include "DNA_userdef_types.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_context.h"
index 6e158fe2e66351951b27b9c34f9c0e6b097757c7..52cee23194beab414996f9b2b9edc53c46c82977 100644 (file)
@@ -9,16 +9,16 @@
 #include "DNA_scene_types.h"
 #include "DNA_brush_types.h"
 
-#include "RNA_access.h"
-#include "RNA_define.h"
-
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_brush.h"
 #include "BKE_context.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_paint.h"
 
+#include "RNA_access.h"
+#include "RNA_define.h"
 
 #include "BIF_gl.h"
 
index 2f837c92ccbede46d1666bcff8aa3bbd40fbd92b..a62f01e88f0b6da1c2706f83da6998a485ed3384 100644 (file)
@@ -40,6 +40,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
 #include "IMB_imbuf.h"
index 15d940cc8a38413932eac1e164a3d3011883bfc2..482aa08e9fe4281375bbdfb39985a0f974502871 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 #include "BLI_dynstr.h"
 #include "BLI_ghash.h"
 #include "BLI_pbvh.h"
index c9912936399cf0c6b9fd353fef940d5a1a0be621..a8fee6ea39de5bb90d86feb4271f3566eb35a536 100644 (file)
@@ -33,6 +33,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_threads.h"
 
index 80d0b0f881583f33e5fa408a3c13f7efe21f1f07..cd6c7e4305d796c857c8dad28b88f8dfde109903 100644 (file)
@@ -32,6 +32,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 #include "DNA_packedFile_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"
@@ -45,9 +48,6 @@
 #include "BKE_packedFile.h"
 #include "BKE_sound.h"
 
-#include "BLI_blenlib.h"
-
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
index cf515a25020f2a6b149d6c9fd6879082f780e45e..6b0511d2384aea4ba7f40d17d7beff9f0c15ea31 100644 (file)
@@ -34,9 +34,9 @@
 #include <string.h>
 #include <float.h>
 
-
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 /* Types --------------------------------------------------------------- */
 
index 250ce37826bdc711cc02172886a1989cf8cc1126..7756075b292c378bbb45fe1ef491b933fee02fe9 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
index 2d47424dc99d568fbcd709ef3d5146edba5a61e4..26990878e46cdcde2ee9601f3ad2f897676ef5d0 100644 (file)
@@ -34,6 +34,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_dlrbTree.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
index a2d116797e35cb728948fe2907ee23b83550bda8..031743953ec4f0073175de18770c41c76dfd571e 100644 (file)
@@ -37,6 +37,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index 0d0d371372318da25f4d885336180e16a4e2ca14..74f897cd8e8e97a252ec2f6d70ae098be38d5f19 100644 (file)
@@ -25,7 +25,9 @@
 #include <stdlib.h>
 
 #include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_object_types.h"
 #include "DNA_windowmanager_types.h"
index 2d16bb6bc8173d09bfc162e71c6b0c6b1c0f90e4..75a3e7cbf308130055ce1b38d259f03f2d3bc956 100644 (file)
@@ -30,6 +30,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
+
 #include "DNA_armature_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
@@ -38,8 +41,6 @@
 #include "DNA_world_types.h"
 #include "DNA_brush_types.h"
 
-#include "BLI_listbase.h"
-
 #include "BKE_context.h"
 #include "BKE_action.h"
 #include "BKE_material.h"
index 9071d9f27d9953329bb09d330eff60311a35d217..66c96ce591b1e3e5d2ebe0ecef250387d9171852 100644 (file)
@@ -29,9 +29,8 @@
 #include <string.h>
 #include <stdio.h>
 
-
-
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_context.h"
index 18e906e7dc20c8e83ff0d32d1755a92564f226c3..b7c9bdde0e8a9239a02fada2091cd40f06c1d911 100644 (file)
@@ -36,6 +36,7 @@
 #include "BLI_path_util.h"
 #include "BLI_storage.h"
 #include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index b09137f084e3e3176a583ff66838cd27d27271ca..b33231f190c47e588b74dbe36c3f188aca7a98d1 100644 (file)
 #include <string.h>
 #include <stdio.h>
 
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index 0bb0d78a497a9d65618388bf31c22be431bf2e2e..6c3666a56b4ad56701c2a3c2bb63695b0daeeba0 100644 (file)
 #include <sys/stat.h>
 #include <limits.h>
 
-
 #include "BLF_api.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 
-// #include "BKE_suggestions.h"
 #include "BKE_report.h"
 #include "BKE_utildefines.h"
 
index 405c965ecceb925fc6e6f73df43799aecfba3d7f..a2c65bc2b08530550bb423eed9075a2e1a5c0324 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_text.h" /* only for character utility funcs */
index 4fbe96c0e540c9557bc3904cf0d3763bde456729..c44d13aa058738129ab289141f8e8bba655c1ddc 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
@@ -42,7 +43,6 @@
 
 #include "BIF_gl.h"
 
-
 #include "RNA_access.h"
 
 #include "WM_api.h"
index ece227494c6853f19e6f77d7ea0647e3e44512f4..84090c88abc4efffed03e2f63f2013cc2f7f3035 100644 (file)
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 #include "BLI_dynstr.h"
 #include "BLI_storage_types.h"
 #ifdef WIN32
index 2e8db0dc9981447eb99f24831a456fb341197015..17b5394656966bd2601b49024c8b9e8562722dea 100644 (file)
@@ -33,6 +33,7 @@
 #include "BKE_main.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 #include "BLI_storage_types.h"
 #ifdef WIN32
 #include "BLI_winstuff.h"
index 4d9bd9bf54a44f832d0f1fe9e7b585f2fe5150c1..f9c467a039d3eb008ba02768d00ffcd565336144 100644 (file)
@@ -30,6 +30,7 @@
 #include "BKE_screen.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
index ce4b5bdd4dee90cacae508608798125864b91c3f..e16b2f650eb84b4d11cf187eee0c7df35698dd68 100644 (file)
@@ -46,6 +46,7 @@
 #include "BLI_linklist.h"
 #include "BLI_storage_types.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #ifdef WIN32
 #include "BLI_winstuff.h"
index d55fcd7d8bad554ef3d90869c9871ba7963e243a..9e29967a7925eca1f5b8812819eec3bf8fc67f75 100644 (file)
@@ -62,6 +62,7 @@
 #include "BLI_path_util.h"
 #include "BLI_storage_types.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index 12cca144d8098f27a6952db73da6ed0ee4c85bbc..b8ffc73caf0060258cc330a7c8c824491710552d 100644 (file)
@@ -42,6 +42,7 @@
 #include "BLI_math.h"
 #include "BLI_rand.h"
 #include "BLI_storage_types.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index d34ef74b66afe30962ae17bc8e68c09f376127f2..c937ebca5474cb987a6da56623a41c46c1d5a1d4 100644 (file)
@@ -41,6 +41,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
index 08e3870f8a24fdd6fdfa55baa8a2140d35fb1a7b..271b6ae8fdeb9061cebc03eeac020a20534b85ee 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
index c948cf6c20d11c2afc0ed4d15fae5d298a6d796c..154c955c48e15cac420a85532929cbaf9db4fbde 100644 (file)
@@ -38,6 +38,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
index 1939de69e147da1ba9bdb3c007f4fcee7d39c17d..4f529df24dcb2da3f896d8afb3ee86d0f752553f 100644 (file)
 #include <stdlib.h>
 #include <math.h>
 
-
 #include "DNA_scene_types.h"
 #include "DNA_anim_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_sound.h"
index 05fcb3c6bf8e32ddaeaeb2971862f99f5d4ef031..58a5f4b113e1e3f224ec3c931f4abb839076ff98 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
index d9d1f0ae3e4b81ecdeec1e4dbb8180c131a605b5..37d58e5591b3dd06abe8b8578ca034ccbbbeab6b 100644 (file)
@@ -37,6 +37,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index ec3861ae06ed8a59f33f8a6c1a27ded4aae925aa..7509903246bbbb5ea23fd2f500e579b6f69a040e 100644 (file)
@@ -40,6 +40,7 @@
 #include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
index 6e7af2cb196bd97e11a310cb3e1a0558cd13a3b2..e2d58b1df5f9809c3b83a025d13910b50aa7933a 100644 (file)
@@ -39,7 +39,9 @@
 #include "DNA_brush_types.h"
 
 #include "PIL_time.h"
+
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
index 772592875c2be68711c5afeed59bffe69aeaaa6c..ceb7cda2316bfabf2ccb3e40fc519620f8c25f2f 100644 (file)
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
 
-
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 
-
 #include "ED_image.h"
 
 #include "WM_types.h"
 
-
 #include "UI_interface.h"
 
-
-
 #include "image_intern.h"
 
 /********************** toolbox operator *********************/
index 2b6958e436e0aff525b495fc002bd4c125acc50e..69bbfb78d811f353e952c732ecec354f6551d304 100644 (file)
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_math.h"
+#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 #include "DNA_object_types.h"
 #include "DNA_node_types.h"
 #include "DNA_packedFile_types.h"
@@ -48,9 +52,6 @@
 #include "BKE_report.h"
 #include "BKE_screen.h"
 
-#include "BLI_math.h"
-#include "BLI_blenlib.h"
-
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
index 5fa0a2de20258dc9f3199354218aa15db2856070..d80801f886874e6620164e88cceb02174c440c27 100644 (file)
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "BLI_utildefines.h"
+
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 
index db8362324a534289371072c37753f75b5fc0dae6..c911adb0c164f7da75bc04618c79838a1284fe42 100644 (file)
@@ -39,6 +39,7 @@
 #include "BLI_math.h"
 #include "BLI_editVert.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
index cc5e02c6266a5e87b88929556b1ba4e30d392df2..ba3beffafcefab615325d51a026c16003bf1c06c 100644 (file)
 #include <sys/stat.h>
 #include <limits.h>
 
-
 #include "BLF_api.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_space_types.h"
 #include "DNA_screen_types.h"
index 190814a4da020df8fb0ef4c1e0a515559d99d4ae..a20d3b961c08ab9c0526f5096e828482e2b7f06d 100644 (file)
@@ -38,6 +38,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_bpath.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index 787d70805c639bc1ccbc20cdbfa4f921e3540123..46c4c8c2dfedd7594215382eac8ca319fd7a2595 100644 (file)
@@ -28,9 +28,9 @@
 
 #include "MEM_guardedalloc.h"
 
-
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 
index b4185d1b958c9cd403fccb2d319a8569c98d1bec..cf3607e8fba8007e3701e70f34d60c7dc8a92380 100644 (file)
 #include "DNA_meta_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_anim.h"
 #include "BKE_displist.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_key.h"
 #include "BKE_mesh.h"
 #include "BKE_particle.h"
-#include "BKE_utildefines.h"
 
 #include "ED_armature.h"
 #include "ED_mesh.h"
index 8bfcad4bab7c607feb27e222633455547578b744..80040f55a087a784c190abc5cccd23b793125029 100644 (file)
 #include <string.h>
 #include <stdio.h>
 
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index a8452731d68e70313a6267e07eedc01e890b8c08..251aa1cdd981fa1b63c8cf4e3b9aaf2f381146ee 100644 (file)
@@ -30,6 +30,8 @@
 
 #include "BLF_api.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 #include "BIF_gl.h"
index 61cb30184243731e7bdfec5ce551704e23d5462d..2148dd289ca3b67846198689ea4eb144d3f93491 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-
 #include <string.h>
 #include <stdio.h>
 
-
-
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
 
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 
index 5c498a598841b7d1c5e7d2216c3c39d745f4fa77..cda2aea23fad640a390a1e8e5f067179b79b93b1 100644 (file)
@@ -33,6 +33,7 @@
 #include "DNA_actuator_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_main.h"
index d5450a1369c84f6f42ef732e5ff61a6d83b2ec3c..c7b60f5abd9fead6e967d78f4ec786213d71c8a6 100644 (file)
@@ -45,6 +45,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index 9a3cac02c50fd1854c89c737aa7c9120e042122c..a945af502a098ff8cc0c0236bd08313d4cad7efa 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index baab6ab353a72109af1f4b1726566cae2f3bbdb9..1e84bda2a29233ecba328ec1edc2794f972c2507 100644 (file)
@@ -33,6 +33,8 @@
 
 #include "DNA_anim_types.h"
 
+#include "BLI_utildefines.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_math.h"
index 72c869c21a7854665d395f6eb6088401c34c9f96..2a03f00e7872ed69089404310accfc3e84f68f0d 100644 (file)
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_animsys.h"
 #include "BKE_nla.h"
index eebca82b8d1a7baf9ed672f7a8085f340752baad..43a64f07de5b16f150749327d75fa65c969efe9e 100644 (file)
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
 
-
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
 #include "BLI_dlrbTree.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_fcurve.h"
 #include "BKE_nla.h"
index e04ef99e6fe13ab24ded4a3c83c62f2d37c9edd3..d1417d69ae3e3224d7ef439ae81a02564895349a 100644 (file)
@@ -38,6 +38,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_action.h"
 #include "BKE_fcurve.h"
index 814b7c0c2c307362267b74ab5589115999e06eb7..db9255a867b865b15e1a8bc33c2a204510dded41 100644 (file)
@@ -37,6 +37,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index 5ee2b172c7cdd2ef742fa9a3a0f36e25c6569ef5..85b52312f563e1a71eef400c6ad2a3a82a6aeeab 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_node_types.h"
 #include "DNA_material_types.h"
index 954018bfd4fdd3288733c0ea3f20c070070cb7c3..69a6029e14033cbb11532a30375329adf0926a08 100644 (file)
 #include <math.h>
 #include <float.h>
 
+#include "MEM_guardedalloc.h"
+
 #include "DNA_node_types.h"
 #include "DNA_scene_types.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_node.h"
 #include "BKE_screen.h"
 
-
 #include "WM_api.h"
 #include "WM_types.h"
 
index 9019b1815a47586d97983af9b3e6faccc95ebee8..5028d1ca1d76f30ebfe009c894a0ccf1fa4bf95e 100644 (file)
@@ -40,6 +40,7 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
index ead3eccd16cae39a8f9f8afd38744ecc89a4b50b..6a6c7c6eead61bb8c12bb915b3a9fd0eac2ad934 100644 (file)
 #include "DNA_node_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_math.h"
+#include "BLI_blenlib.h"
+#include "BLI_storage_types.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_texture.h"
 #include "BKE_report.h"
 
-
-#include "BLI_math.h"
-#include "BLI_blenlib.h"
-#include "BLI_storage_types.h"
-
 #include "RE_pipeline.h"
 
 #include "IMB_imbuf_types.h"
index d215dc53b84a6d0dd1e8342f3fc16e31689f1606..147a08252293e00a68c11e8d85e810cfebe90b1d 100644 (file)
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
 #include "BKE_node.h"
 #include "BKE_main.h"
 
-
 #include "WM_api.h"
 #include "WM_types.h"
 
index 617397359d9bb34d571d91b80f35e1d87ec3692e..748ba847f222e2babb4338f1642186b38212c675 100644 (file)
@@ -34,6 +34,7 @@
 #include "BKE_context.h"
 
 #include "BLI_rect.h"
+#include "BLI_utildefines.h"
 
 #include "ED_screen.h"
 #include "ED_types.h"
index cdb04ec373ca3dd5ae5221f097a702134684161c..4f2f204fbe611cc2c5ecd6807c437b43698694e9 100644 (file)
 #include "DNA_node_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_rect.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_node.h"
 
-#include "BLI_rect.h"
-
 #include "ED_screen.h"
 
 #include "RNA_access.h"
index b6bd8df64ec21d815b703e38fd66d8605c1b8565..eb8c34fe8bdef1031bfc815426f5be3bf6fbc507 100644 (file)
@@ -39,6 +39,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index a443539eace1bbf48b6534cef052c70a222d79b6..354643b565c818d141a6a808da76b710b93362e5 100644 (file)
@@ -51,6 +51,7 @@
 #include "DNA_object_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #if defined WIN32 && !defined _LIBC
 # include "BLI_fnmatch.h" /* use fnmatch included in blenlib */
index 8bb49b8527197f88b554f4f619e833193455b01c..74c2dd5db1c4984b2871a88be23baece699c06c8 100644 (file)
 #include <string.h>
 #include <stdio.h>
 
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index ba51fd93f92320fedff88a15caea82612df52fbd..3da5b48db8e8548a784cbb975516ac09cab0708c 100644 (file)
@@ -29,9 +29,8 @@
 #include <string.h>
 #include <stdio.h>
 
-
-
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 
index 1159139eff58840ca9ddac88e3365b07b479b448..3e6ebe64920c26b16f79d2c708d2179e26b52dd9 100644 (file)
@@ -29,9 +29,9 @@
 #include <string.h>
 #include <stdio.h>
 
-
-
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 #include "BKE_context.h"
 
 #include "ED_types.h"
 #include "ED_util.h"
 
-
-
 #include "UI_interface.h"
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
 #include "script_intern.h"
 
-
 /* ************************ header area region *********************** */
 
 static void do_viewmenu(bContext *UNUSED(C), void *UNUSED(arg), int UNUSED(event))
index 106c79f8fd0e27f5436850f7a75cff13c9a1510f..d0631f5651aeb024bc93309a02a1518a787787ee 100644 (file)
 #include <string.h>
 #include <stdio.h>
 
-
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index adf1de8a1256d7a1a0b90a27dc98ae7635b64749..eb7ae1d80112ab9d4aadf4f70ab04d01a19aaa11 100644 (file)
@@ -40,7 +40,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_storage_types.h"
-
+#include "BLI_utildefines.h"
 
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
index aa0686bc9bb1cebf97f835869eb7c6192131eccb..ee0a5d69113f6ab073366575cb76120bfc296815 100644 (file)
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
-
 #include "ED_screen.h"
 
-
 #include "WM_api.h"
 #include "WM_types.h"
 
index 3cf747a07796064a68ebb6be5b35845889608c29..47efdb6ad3bd819322272e7a77f0663e85366f33 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "IMB_imbuf_types.h"
 
index eb20ce6ed3c771f62e794bd706ad634ee9e4211d..9ae9eac7602ca54f4b856e8e6574aa16ec9a3164 100644 (file)
@@ -41,7 +41,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_storage_types.h"
-
+#include "BLI_utildefines.h"
 
 #include "DNA_scene_types.h"
 #include "DNA_userdef_types.h"
index f5c8388bf67e33a50730c90cb3f6ff638e6dc16b..8f879003a2d6652412644a9a27bba9b853e23d6d 100644 (file)
@@ -26,6 +26,8 @@
 #include <math.h>
 #include <string.h>
 
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 #include "IMB_imbuf_types.h"
index a2eefe6ee54e4a909707b5ddc7a02c7e52a6afa4..a20d2d7680e80a67e13a029ff877b5c5d59af404 100644 (file)
@@ -35,9 +35,9 @@
 #endif
 #include <sys/types.h>
 
-
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_scene_types.h"
 
index 3dd8a29eac388978038cf0ec0a9d6c667dc534dd..ed280d765f0ef19ef184fa1dfa6f7afb509ac872 100644 (file)
@@ -36,6 +36,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_path_util.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index c857d33bcabbd7f943b0ecf1b41e98afac212544..cdb5ce67a7e02cb596e492e596eaba9961b508ca 100644 (file)
@@ -33,6 +33,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_context.h"
@@ -41,7 +42,6 @@
 #include "ED_types.h"
 #include "ED_util.h"
 
-
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
index 99b244799670f6731bfd055fc15f7f10a89e6430..200f15f61098a2334dbecd4dd0305d7f0f996f0f 100644 (file)
@@ -36,6 +36,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index b3d745dafe78fa3dca0da84722767737107750b3..75001b9514c997427b96b1f399499105c2ef4c59 100644 (file)
@@ -37,6 +37,7 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
index f682da5f179b68def39b8172d42169bbb2441157..620067b035cbbfe4a9cc243fc5108a73fb9a0467 100644 (file)
@@ -36,6 +36,7 @@
 #include "BLF_api.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "DNA_text_types.h"
 #include "DNA_space_types.h"
index 8ad4d6fa89067f226e38b0c9ca0ed97d589d5004..1287f68dc043ed9284b1ddf824aa83b21617170d 100644 (file)
@@ -47,6 +47,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 
index 03d806f446c2848c72b19eb142b0a22e3619d5b5..061a60440f4af16a57837b21f1bdd99317e9acd6 100644 (file)
@@ -38,6 +38,8 @@
 #include "DNA_userdef_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
 #include "PIL_time.h"
 
 #include "BKE_context.h"
index 9a1fc201564b5c20d768b7864cf11a653793c560..4a45b6b6cbbbd32abc8a3ede2516f2b48b8f3189 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_dlrbTree.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_global.h"
index edb3da5a06e669ae2c983becc8c83b18c5b9a070..5bc59f06a19f08c80bf3ed9541fe2e4abc37b0a3 100644 (file)
 #include <stdlib.h>
 #include <math.h>
 
-
 #include "DNA_scene_types.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 
-
 #include "ED_screen.h"
 
-
 #include "WM_api.h"
 #include "WM_types.h"
 
-
 /* ****************** Start/End Frame Operators *******************************/
 
 static int time_set_sfra_exec (bContext *C, wmOperator *UNUSED(op))
index a59c03ad17d04e017d08a8b411c125ccfa1c31a5..6f155fc3b9967df7530d244ad8a6f5cc85cf9168 100644 (file)
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
 
-
 #include "WM_api.h"
 #include "WM_types.h"