Commit: ec7c3b5b4fe869ea8587a5b50cbc293010fd98d8 Author: Jacques Lucke Date: Wed Oct 17 09:53:05 2018 +0200 Branches: blender2.8 https://developer.blender.org/rBec7c3b5b4fe869ea8587a5b50cbc293010fd98d8
Cleanup: better naming Suggested by Campbell here: https://developer.blender.org/rB09cd651bb7e59044cbcd0664e8b1064cb37734ed =================================================================== M source/blender/editors/include/ED_view3d.h M source/blender/editors/space_view3d/space_view3d.c M source/blender/editors/space_view3d/view3d_select.c =================================================================== diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 0b87a5e57f0..5913a037b87 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -470,7 +470,7 @@ struct ImBuf *ED_view3d_draw_offscreen_imbuf_simple( struct Base *ED_view3d_give_base_under_cursor(struct bContext *C, const int mval[2]); struct Object *ED_view3d_give_object_under_cursor(struct bContext *C, const int mval[2]); -bool ED_view3d_there_is_an_object_under_cursor(struct bContext *C, const int mval[2]); +bool ED_view3d_is_object_under_cursor(struct bContext *C, const int mval[2]); void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar, bool do_clip); void ED_view3d_update_viewmat( struct Depsgraph *depsgraph, struct Scene *scene, struct View3D *v3d, struct ARegion *ar, diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index d58d928291c..dbec52de1a1 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -601,7 +601,7 @@ static bool view3d_ima_bg_drop_poll(bContext *C, wmDrag *drag, const wmEvent *ev return false; } - if (ED_view3d_there_is_an_object_under_cursor(C, event->mval)) { + if (ED_view3d_is_object_under_cursor(C, event->mval)) { return false; } diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index b177f25375e..b29414dbe18 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1535,7 +1535,7 @@ Object *ED_view3d_give_object_under_cursor(bContext *C, const int mval[2]) return NULL; } -bool ED_view3d_there_is_an_object_under_cursor(bContext *C, const int mval[2]) +bool ED_view3d_is_object_under_cursor(bContext *C, const int mval[2]) { return ED_view3d_give_object_under_cursor(C, mval) != NULL; } _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
