diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-16 05:18:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-16 05:18:03 +0300 |
commit | a57f32b14cecaff0fa478b645b8eb741e3171e4e (patch) | |
tree | 6dff95a3887fabbcb7ba570b66e0b3a5a1d678ca /source | |
parent | 1b65a95a08f362b79022642c300a66019cceda2b (diff) |
Cleanup: headers
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 64 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 16 |
2 files changed, 9 insertions, 71 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index a3897ad89f2..9a73ef25819 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -27,93 +27,31 @@ * \ingroup spview3d */ -#include "MEM_guardedalloc.h" - -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_constraint_types.h" /* for drawing constraint */ -#include "DNA_lamp_types.h" -#include "DNA_lattice_types.h" -#include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meta_types.h" -#include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" -#include "DNA_smoke_types.h" -#include "DNA_world_types.h" #include "DNA_object_types.h" -#include "BLI_listbase.h" -#include "BLI_link_utils.h" -#include "BLI_string.h" #include "BLI_math.h" -#include "BLI_memarena.h" - -#include "BKE_anim.h" /* for the where_on_path function */ -#include "BKE_armature.h" -#include "BKE_camera.h" -#include "BKE_colortools.h" -#include "BKE_constraint.h" /* for the get_constraint_target function */ -#include "BKE_context.h" -#include "BKE_curve.h" + #include "BKE_DerivedMesh.h" -#include "BKE_deform.h" -#include "BKE_displist.h" -#include "BKE_font.h" #include "BKE_global.h" -#include "BKE_image.h" -#include "BKE_key.h" -#include "BKE_layer.h" -#include "BKE_lattice.h" -#include "BKE_main.h" -#include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" -#include "BKE_material.h" -#include "BKE_mball.h" -#include "BKE_modifier.h" -#include "BKE_movieclip.h" -#include "BKE_object.h" -#include "BKE_paint.h" -#include "BKE_particle.h" -#include "BKE_pointcache.h" -#include "BKE_scene.h" -#include "BKE_subsurf.h" -#include "BKE_unit.h" -#include "BKE_tracking.h" -#include "BKE_gpencil.h" #include "BKE_editmesh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" - -#include "BIF_gl.h" -#include "BIF_glutil.h" - #include "GPU_draw.h" -#include "GPU_select.h" #include "GPU_shader.h" #include "GPU_immediate.h" -#include "GPU_immediate_util.h" #include "GPU_batch.h" #include "GPU_matrix.h" #include "GPU_state.h" #include "GPU_framebuffer.h" #include "ED_mesh.h" -#include "ED_particle.h" -#include "ED_screen.h" -#include "ED_sculpt.h" -#include "ED_types.h" #include "UI_resources.h" -#include "UI_interface_icons.h" - -#include "WM_api.h" -#include "BLF_api.h" #include "view3d_intern.h" /* bad level include */ diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 99132820b20..a7e3aaa7324 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -105,8 +105,8 @@ void VIEW3D_OT_clear_render_border(struct wmOperatorType *ot); void VIEW3D_OT_zoom_border(struct wmOperatorType *ot); void VIEW3D_OT_toggle_shading(struct wmOperatorType *ot); -void view3d_boxview_copy(ScrArea *sa, ARegion *ar); -void view3d_boxview_sync(ScrArea *sa, ARegion *ar); +void view3d_boxview_copy(struct ScrArea *sa, struct ARegion *ar); +void view3d_boxview_sync(struct ScrArea *sa, struct ARegion *ar); void view3d_orbit_apply_dyn_ofs( float r_ofs[3], const float ofs_old[3], const float viewquat_old[4], @@ -149,14 +149,14 @@ void ED_view3d_draw_depth( struct ARegion *ar, View3D *v3d, bool alphaoverride); /* view3d_draw_legacy.c */ -void ED_view3d_draw_depth_gpencil(struct Depsgraph *depsgraph, Scene *scene, ARegion *ar, View3D *v3d); +void ED_view3d_draw_depth_gpencil(struct Depsgraph *depsgraph, Scene *scene, struct ARegion *ar, View3D *v3d); void ED_view3d_draw_select_loop( - struct Depsgraph *depsgraph, ViewContext *vc, Scene *scene, struct ViewLayer *view_layer, View3D *v3d, ARegion *ar, + struct Depsgraph *depsgraph, ViewContext *vc, Scene *scene, struct ViewLayer *view_layer, View3D *v3d, struct ARegion *ar, bool use_obedit_skip, bool use_nearest); void ED_view3d_draw_depth_loop( - struct Depsgraph *depsgraph, Scene *scene, ARegion *ar, View3D *v3d); + struct Depsgraph *depsgraph, Scene *scene, struct ARegion *ar, View3D *v3d); void ED_view3d_after_add(ListBase *lb, Base *base, const short dflag); @@ -202,7 +202,7 @@ void ED_view3d_smooth_view_force_finish( void view3d_winmatrix_set( struct Depsgraph *depsgraph, - ARegion *ar, const View3D *v3d, const rcti *rect); + struct ARegion *ar, const View3D *v3d, const rcti *rect); void view3d_viewmatrix_set( struct Depsgraph *depsgraph, Scene *scene, const View3D *v3d, RegionView3D *rv3d, const float rect_scale[2]); @@ -248,8 +248,8 @@ void VIEW3D_OT_snap_cursor_to_selected(struct wmOperatorType *ot); void VIEW3D_OT_snap_cursor_to_active(struct wmOperatorType *ot); /* space_view3d.c */ -ARegion *view3d_has_buttons_region(ScrArea *sa); -ARegion *view3d_has_tools_region(ScrArea *sa); +struct ARegion *view3d_has_buttons_region(struct ScrArea *sa); +struct ARegion *view3d_has_tools_region(struct ScrArea *sa); extern const char *view3d_context_dir[]; /* doc access */ |