diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 04:13:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 04:14:26 +0300 |
commit | 1443235aa4e876152940a2b0c07054179487c129 (patch) | |
tree | 755a6e2e5d67cbbc7befb4db8a70de2a95dfcca9 /source/blender/editors/space_view3d/view3d_intern.h | |
parent | bf7e4067663cec0a3b4d3194e89a28aa62b39773 (diff) |
Cleanup: sync w/ blender2.8 branch
Also make some args const
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_intern.h')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index b1ccb508e50..59b4f770ec3 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -142,8 +142,12 @@ void draw_motion_paths_cleanup(View3D *v3d); /* drawobject.c */ -void draw_object(Scene *scene, struct ARegion *ar, View3D *v3d, Base *base, const short dflag); -void draw_object_select(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short dflag); +void draw_object( + Scene *scene, struct ARegion *ar, View3D *v3d, + Base *base, const short dflag); +void draw_object_select( + Scene *scene, ARegion *ar, View3D *v3d, + Base *base, const short dflag); bool draw_glsl_material(Scene *scene, struct Object *ob, View3D *v3d, const char dt); void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob, const char dt, int outline); @@ -169,9 +173,10 @@ enum { int view3d_effective_drawtype(const struct View3D *v3d); /* drawarmature.c */ -bool draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, - const short dt, const short dflag, const unsigned char ob_wire_col[4], - const bool is_outline); +bool draw_armature( + Scene *scene, View3D *v3d, ARegion *ar, Base *base, + const short dt, const short dflag, const unsigned char ob_wire_col[4], + const bool is_outline); /* drawmesh.c */ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, @@ -195,7 +200,10 @@ void draw_sim_debug_data(Scene *scene, View3D *v3d, ARegion *ar); /* view3d_draw.c */ void view3d_main_region_draw(const struct bContext *C, struct ARegion *ar); -void ED_view3d_draw_depth(Scene *scene, struct ARegion *ar, View3D *v3d, bool alphaoverride); + +void ED_view3d_draw_depth( + Scene *scene, + struct ARegion *ar, View3D *v3d, bool alphaoverride); void ED_view3d_draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d); void ED_view3d_draw_select_loop( ViewContext *vc, Scene *scene, View3D *v3d, ARegion *ar, @@ -247,8 +255,11 @@ void ED_view3d_smooth_view_force_finish( struct bContext *C, struct View3D *v3d, struct ARegion *ar); -void view3d_winmatrix_set(ARegion *ar, const View3D *v3d, const rcti *rect); -void view3d_viewmatrix_set(Scene *scene, const View3D *v3d, RegionView3D *rv3d, const float rect_scale[2]); +void view3d_winmatrix_set( + ARegion *ar, const View3D *v3d, const rcti *rect); +void view3d_viewmatrix_set( + Scene *scene, + const View3D *v3d, RegionView3D *rv3d, const float rect_scale[2]); void fly_modal_keymap(struct wmKeyConfig *keyconf); void walk_modal_keymap(struct wmKeyConfig *keyconf); |