forked from bartvdbraak/blender
Cleanup: duplicate includes
This commit is contained in:
parent
937ecaf77e
commit
3ce4a58aa9
@ -32,12 +32,11 @@
|
||||
#include "BLI_fileops.h"
|
||||
#include "BLI_path_util.h"
|
||||
|
||||
#include "BKE_blender.h" /* BLENDER_VERSION */
|
||||
#include "BKE_appdir.h" /* own include */
|
||||
|
||||
#include "GHOST_Path-api.h"
|
||||
|
||||
#include "../blenkernel/BKE_blender.h" /* BLENDER_VERSION, bad level include (no function call) */
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#ifdef WIN32
|
||||
|
@ -27,7 +27,6 @@
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_compiler_attrs.h"
|
||||
#include "BLI_string.h"
|
||||
|
||||
/* for MinGW32 definition of NULL, could use BLI_blenlib.h instead too */
|
||||
#include <stddef.h>
|
||||
@ -49,7 +48,6 @@
|
||||
#include "DNA_particle_types.h"
|
||||
#include "DNA_linestyle_types.h"
|
||||
#include "DNA_actuator_types.h"
|
||||
#include "DNA_camera_types.h"
|
||||
#include "DNA_view3d_types.h"
|
||||
|
||||
#include "DNA_genfile.h"
|
||||
@ -60,7 +58,6 @@
|
||||
#include "BKE_scene.h"
|
||||
#include "BKE_sequencer.h"
|
||||
#include "BKE_screen.h"
|
||||
#include "BKE_sequencer.h"
|
||||
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_listbase.h"
|
||||
|
@ -32,7 +32,6 @@
|
||||
#include "COM_ExecutionSystem.h"
|
||||
#include "COM_ReadBufferOperation.h"
|
||||
#include "COM_WriteBufferOperation.h"
|
||||
#include "COM_ReadBufferOperation.h"
|
||||
#include "COM_WorkScheduler.h"
|
||||
#include "COM_ViewerOperation.h"
|
||||
#include "COM_ChunkOrder.h"
|
||||
|
@ -20,7 +20,6 @@
|
||||
*/
|
||||
|
||||
#include "COM_Node.h"
|
||||
#include "DNA_node_types.h"
|
||||
|
||||
extern "C" {
|
||||
# include "DNA_movieclip_types.h"
|
||||
|
@ -50,7 +50,7 @@
|
||||
#include "UI_view2d.h"
|
||||
|
||||
#include "info_intern.h"
|
||||
#include "../space_info/textview.h"
|
||||
#include "textview.h"
|
||||
|
||||
/* complicates things a bit, so leaving in old simple code */
|
||||
#define USE_INFO_NEWLINE
|
||||
|
@ -79,11 +79,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef WITH_REDCODE
|
||||
# ifdef _WIN32 /* on windows we use the one in extern instead */
|
||||
# include "libredcode/format.h"
|
||||
# else
|
||||
# include "libredcode/format.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "IMB_imbuf_types.h"
|
||||
|
@ -99,13 +99,8 @@
|
||||
#endif //WITH_FFMPEG
|
||||
|
||||
#ifdef WITH_REDCODE
|
||||
#ifdef _WIN32 /* on windows we use the ones in extern instead */
|
||||
#include "libredcode/format.h"
|
||||
#include "libredcode/codec.h"
|
||||
#else
|
||||
#include "libredcode/format.h"
|
||||
#include "libredcode/codec.h"
|
||||
#endif
|
||||
# include "libredcode/format.h"
|
||||
# include "libredcode/codec.h"
|
||||
#endif
|
||||
|
||||
#include "IMB_colormanagement.h"
|
||||
|
@ -41,7 +41,6 @@
|
||||
#include "IMB_anim.h"
|
||||
#include "imbuf.h"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
#include "BKE_global.h"
|
||||
|
||||
#ifdef WITH_AVI
|
||||
|
@ -111,8 +111,6 @@ EnumPropertyItem brush_image_tool_items[] = {
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "DNA_object_types.h"
|
||||
|
||||
#include "RNA_access.h"
|
||||
|
||||
#include "BKE_texture.h"
|
||||
|
@ -46,9 +46,6 @@
|
||||
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "BKE_curve.h"
|
||||
#include "ED_curve.h"
|
||||
|
||||
#ifndef RNA_RUNTIME
|
||||
static EnumPropertyItem beztriple_handle_type_items[] = {
|
||||
{HD_FREE, "FREE", 0, "Free", ""},
|
||||
@ -124,8 +121,6 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = {
|
||||
|
||||
#ifdef RNA_RUNTIME
|
||||
|
||||
#include "BLI_math.h"
|
||||
|
||||
#include "DNA_object_types.h"
|
||||
|
||||
#include "BKE_curve.h"
|
||||
|
@ -56,7 +56,6 @@
|
||||
#include "IMB_imbuf.h"
|
||||
#include "IMB_colormanagement.h"
|
||||
|
||||
#include "BIF_gl.h"
|
||||
#include "GPU_draw.h"
|
||||
#include "GPU_debug.h"
|
||||
|
||||
|
@ -48,7 +48,6 @@
|
||||
#include <stddef.h>
|
||||
|
||||
#include "DNA_object_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
|
||||
#include "BKE_animsys.h"
|
||||
#include "BKE_depsgraph.h"
|
||||
|
@ -52,12 +52,10 @@
|
||||
|
||||
#ifdef RNA_RUNTIME
|
||||
|
||||
#include "DNA_mask_types.h"
|
||||
#include "DNA_movieclip_types.h"
|
||||
|
||||
#include "BKE_depsgraph.h"
|
||||
#include "BKE_mask.h"
|
||||
#include "BKE_tracking.h"
|
||||
|
||||
#include "BLI_math.h"
|
||||
|
||||
|
@ -75,7 +75,6 @@ EnumPropertyItem mesh_delimit_mode_items[] = {
|
||||
#include "ED_mesh.h" /* XXX Bad level call */
|
||||
|
||||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "rna_mesh_utils.h"
|
||||
|
||||
|
@ -30,7 +30,6 @@
|
||||
|
||||
#include "BLI_listbase.h"
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_string.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
@ -39,7 +38,6 @@
|
||||
#include "DNA_mesh_types.h"
|
||||
#include "DNA_node_types.h"
|
||||
#include "DNA_object_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
#include "DNA_text_types.h"
|
||||
#include "DNA_texture_types.h"
|
||||
|
||||
@ -48,7 +46,6 @@
|
||||
#include "BKE_node.h"
|
||||
#include "BKE_image.h"
|
||||
#include "BKE_texture.h"
|
||||
#include "BKE_idprop.h"
|
||||
|
||||
#include "RNA_access.h"
|
||||
#include "RNA_define.h"
|
||||
|
@ -46,7 +46,6 @@
|
||||
#include "BKE_paint.h"
|
||||
#include "BKE_editmesh.h"
|
||||
#include "BKE_group.h" /* needed for BKE_group_object_exists() */
|
||||
#include "BKE_object.h" /* Needed for BKE_object_matrix_local_get() */
|
||||
#include "BKE_object_deform.h"
|
||||
|
||||
#include "RNA_access.h"
|
||||
@ -202,7 +201,6 @@ EnumPropertyItem object_axis_unsigned_items[] = {
|
||||
#include "BKE_scene.h"
|
||||
#include "BKE_deform.h"
|
||||
|
||||
#include "ED_mesh.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_particle.h"
|
||||
#include "ED_curve.h"
|
||||
|
@ -109,8 +109,6 @@ EnumPropertyItem color_sets_items[] = {
|
||||
#include "ED_object.h"
|
||||
#include "ED_armature.h"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "WM_api.h"
|
||||
|
||||
#include "RNA_access.h"
|
||||
|
@ -105,7 +105,6 @@ EnumPropertyItem property_unit_items[] = {
|
||||
|
||||
#ifdef RNA_RUNTIME
|
||||
#include "MEM_guardedalloc.h"
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_ghash.h"
|
||||
|
||||
/* Struct */
|
||||
|
@ -42,10 +42,8 @@
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "BKE_freestyle.h"
|
||||
#include "BKE_editmesh.h"
|
||||
#include "BKE_paint.h"
|
||||
#include "BKE_scene.h"
|
||||
|
||||
#include "GPU_extensions.h"
|
||||
|
||||
@ -407,8 +405,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "BLI_threads.h"
|
||||
|
||||
#include "BKE_brush.h"
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_global.h"
|
||||
@ -418,7 +414,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
|
||||
#include "BKE_pointcache.h"
|
||||
#include "BKE_scene.h"
|
||||
#include "BKE_depsgraph.h"
|
||||
#include "BKE_image.h"
|
||||
#include "BKE_mesh.h"
|
||||
#include "BKE_sound.h"
|
||||
#include "BKE_screen.h"
|
||||
@ -426,8 +421,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
|
||||
#include "BKE_animsys.h"
|
||||
#include "BKE_freestyle.h"
|
||||
|
||||
#include "WM_api.h"
|
||||
|
||||
#include "ED_info.h"
|
||||
#include "ED_node.h"
|
||||
#include "ED_view3d.h"
|
||||
@ -435,8 +428,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
|
||||
#include "ED_keyframing.h"
|
||||
#include "ED_image.h"
|
||||
|
||||
#include "RE_engine.h"
|
||||
|
||||
#ifdef WITH_FREESTYLE
|
||||
#include "FRS_freestyle.h"
|
||||
#endif
|
||||
|
@ -75,7 +75,6 @@ EnumPropertyItem sequence_modifier_type_items[] = {
|
||||
#include "BKE_idprop.h"
|
||||
|
||||
#include "WM_api.h"
|
||||
#include "WM_types.h"
|
||||
|
||||
#include "IMB_imbuf.h"
|
||||
|
||||
|
@ -42,8 +42,6 @@
|
||||
|
||||
//#include "DNA_anim_types.h"
|
||||
#include "DNA_image_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
#include "DNA_sequence_types.h"
|
||||
#include "DNA_mask_types.h"
|
||||
#include "DNA_sound_types.h"
|
||||
|
||||
|
@ -35,7 +35,6 @@
|
||||
#include "BKE_key.h"
|
||||
#include "BKE_movieclip.h"
|
||||
#include "BKE_node.h"
|
||||
#include "BKE_screen.h"
|
||||
|
||||
#include "DNA_action_types.h"
|
||||
#include "DNA_key_types.h"
|
||||
@ -58,8 +57,6 @@
|
||||
#include "RE_engine.h"
|
||||
#include "RE_pipeline.h"
|
||||
|
||||
#include "ED_fileselect.h"
|
||||
|
||||
#include "RNA_enum_types.h"
|
||||
|
||||
|
||||
@ -225,7 +222,6 @@ static EnumPropertyItem buttons_texture_context_items[] = {
|
||||
#ifdef RNA_RUNTIME
|
||||
|
||||
#include "DNA_anim_types.h"
|
||||
#include "DNA_mask_types.h"
|
||||
#include "DNA_scene_types.h"
|
||||
#include "DNA_screen_types.h"
|
||||
#include "DNA_userdef_types.h"
|
||||
|
@ -87,7 +87,6 @@ EnumPropertyItem navigation_mode_items[] = {
|
||||
#include "DNA_screen_types.h"
|
||||
|
||||
#include "BKE_blender.h"
|
||||
#include "BKE_DerivedMesh.h"
|
||||
#include "BKE_depsgraph.h"
|
||||
#include "BKE_global.h"
|
||||
#include "BKE_main.h"
|
||||
@ -105,8 +104,6 @@ EnumPropertyItem navigation_mode_items[] = {
|
||||
|
||||
#include "CCL_api.h"
|
||||
|
||||
#include "BKE_addon.h"
|
||||
|
||||
#ifdef WITH_SDL_DYNLOAD
|
||||
# include "sdlew.h"
|
||||
#endif
|
||||
|
@ -67,8 +67,6 @@
|
||||
#include "node_util.h"
|
||||
#include "NOD_texture.h"
|
||||
|
||||
#include "NOD_texture.h"
|
||||
|
||||
#include "BLF_translation.h"
|
||||
|
||||
#include "IMB_imbuf_types.h"
|
||||
|
@ -33,7 +33,7 @@
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "../generic/python_utildefines.h"
|
||||
#include "python_utildefines.h"
|
||||
|
||||
|
||||
PyDoc_STRVAR(py_blf_position_doc,
|
||||
|
@ -41,7 +41,7 @@
|
||||
#include "py_capi_utils.h"
|
||||
#endif
|
||||
|
||||
#include "../generic/python_utildefines.h"
|
||||
#include "python_utildefines.h"
|
||||
|
||||
|
||||
/*********************** ID Property Main Wrapper Stuff ***************/
|
||||
|
@ -37,7 +37,7 @@
|
||||
|
||||
#include "py_capi_utils.h"
|
||||
|
||||
#include "../generic/python_utildefines.h"
|
||||
#include "python_utildefines.h"
|
||||
|
||||
/* only for BLI_strncpy_wchar_from_utf8, should replace with py funcs but too late in release now */
|
||||
#include "BLI_string_utf8.h"
|
||||
|
@ -788,7 +788,6 @@ int BPY_context_member_get(bContext *C, const char *member, bContextDataResult *
|
||||
}
|
||||
|
||||
#ifdef WITH_PYTHON_MODULE
|
||||
#include "BLI_fileops.h"
|
||||
/* TODO, reloading the module isn't functional at the moment. */
|
||||
|
||||
static void bpy_module_free(void *mod);
|
||||
|
@ -52,10 +52,6 @@
|
||||
#include "bpy_rna_callback.h"
|
||||
#include "bpy_intern_string.h"
|
||||
|
||||
#ifdef USE_PYRNA_INVALIDATE_WEAKREF
|
||||
# include "MEM_guardedalloc.h"
|
||||
#endif
|
||||
|
||||
#ifdef USE_PYRNA_INVALIDATE_WEAKREF
|
||||
# include "BLI_ghash.h"
|
||||
#endif
|
||||
|
@ -110,7 +110,7 @@ Py_hash_t mathutils_array_hash(const float *array, size_t array_len)
|
||||
return x;
|
||||
}
|
||||
|
||||
/* helper functionm returns length of the 'value', -1 on error */
|
||||
/* helper function returns length of the 'value', -1 on error */
|
||||
int mathutils_array_parse(float *array, int array_min, int array_max, PyObject *value, const char *error_prefix)
|
||||
{
|
||||
const int flag = array_max;
|
||||
|
Loading…
Reference in New Issue
Block a user