diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-03-09 22:16:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-09 22:58:29 +0300 |
commit | 55a56a31a03ffba115c326c1061762434a72a690 (patch) | |
tree | f4c3952d5c0f1123047d275adb602d0c902bcb5c /source/blender/editors/space_view3d/view3d_intern.h | |
parent | 711ac904816cb4d5e19ed9302b6c99b5aa4eaddd (diff) | |
parent | 62cc226101fab61b5ae2f18f8cbe8f1e5ac6ce82 (diff) |
Merge branch 'master' into blender2.8
Manually merged viewport xray changes
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_intern.h')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index eb961c786af..0354b16c10f 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -145,6 +145,8 @@ void draw_motion_paths_cleanup(View3D *v3d); /* drawobject.c */ void draw_object(Scene *scene, struct SceneLayer *sl, struct ARegion *ar, View3D *v3d, BaseLegacy *base, const short dflag); +void draw_object_select(Scene *scene, struct SceneLayer *sl, struct ARegion *ar, View3D *v3d, Base *base, const short dflag); + void draw_mesh_object_outline(View3D *v3d, Object *ob, struct DerivedMesh *dm); bool draw_glsl_material(Scene *scene, struct SceneLayer *sl, struct Object *ob, View3D *v3d, const char dt); @@ -213,6 +215,10 @@ void view3d_draw_region_info(const struct bContext *C, struct ARegion *ar); void view3d_main_region_draw_legacy(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_gpencil(Scene *scene, ARegion *ar, View3D *v3d); +void ED_view3d_draw_select_loop( + ViewContext *vc, Scene *scene, struct SceneLayer *sl, View3D *v3d, ARegion *ar, + bool use_obedit_skip, bool use_nearest); + void ED_view3d_after_add(ListBase *lb, BaseLegacy *base, const short dflag); void circ(float x, float y, float rad); |