diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-11 07:08:18 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-11 07:09:09 +0300 |
commit | c7ec1fa5e66ef96b7ea1f1c082683c227930bae3 (patch) | |
tree | ae918690dbd5b078a23e41e9faaa5a2cf8bcef92 | |
parent | 7fe3d1e7d718561e275f21acc7261207e67bf685 (diff) |
Cleanup: use BKE_object_* prefix for object API
Also minor style cleanup.
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 37 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_gizmo_empty.c | 2 |
6 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 2ccee7a4a68..136f3749910 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -351,7 +351,7 @@ bool BKE_object_modifier_update_subframe( void BKE_object_type_set_empty_for_versioning(struct Object *ob); -bool BKE_image_empty_visible_in_view3d(const struct Object *ob, const struct RegionView3D *rv3d); +bool BKE_object_empty_image_is_visible_in_view3d(const struct Object *ob, const struct RegionView3D *rv3d); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 9c166d154a3..af815175302 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2672,6 +2672,24 @@ void BKE_object_empty_draw_type_set(Object *ob, const int value) } } +bool BKE_object_empty_image_is_visible_in_view3d(const Object *ob, const RegionView3D *rv3d) +{ + int visibility_flag = ob->empty_image_visibility_flag; + + if ((visibility_flag & OB_EMPTY_IMAGE_VISIBLE_BACKSIDE) == 0) { + if (dot_v3v3((float *)&ob->obmat[2], (float *)&rv3d->viewinv[2]) < 0.0f) { + return false; + } + } + + if (rv3d->is_persp) { + return visibility_flag & OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE; + } + else { + return visibility_flag & OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC; + } +} + bool BKE_object_minmax_dupli(Depsgraph *depsgraph, Scene *scene, Object *ob, float r_min[3], float r_max[3], const bool use_hidden) { bool ok = false; @@ -4048,7 +4066,6 @@ bool BKE_object_modifier_update_subframe( return false; } - void BKE_object_type_set_empty_for_versioning(Object *ob) { ob->type = OB_EMPTY; @@ -4059,21 +4076,3 @@ void BKE_object_type_set_empty_for_versioning(Object *ob) } ob->mode = OB_MODE_OBJECT; } - -bool BKE_image_empty_visible_in_view3d(const Object *ob, const RegionView3D *rv3d) -{ - int visibility_flag = ob->empty_image_visibility_flag; - - if ((visibility_flag & OB_EMPTY_IMAGE_VISIBLE_BACKSIDE) == 0) { - if (dot_v3v3((float *)&ob->obmat[2], (float *)&rv3d->viewinv[2]) < 0.0f) { - return false; - } - } - - if (rv3d->is_persp) { - return visibility_flag & OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE; - } - else { - return visibility_flag & OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC; - } -} diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index d13e206e132..508f3d6da69 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -3809,8 +3809,8 @@ static void mesh_create_edit_tris_and_verts( if (p_orig != ORIGINDEX_NONE) { BMFace *efa = BM_face_at_index(bm, p_orig); if (add_edit_tri_mapped(rdata, vbo_pos_nor, vbo_lnor, vbo_data, elbp, - attr_id.pos, attr_id.vnor, attr_id.lnor, attr_id.data, - efa, mlt, polynors, loopnors, tri_len_used)) + attr_id.pos, attr_id.vnor, attr_id.lnor, attr_id.data, + efa, mlt, polynors, loopnors, tri_len_used)) { tri_len_used += 3; } diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 31314a35232..f25ca72a799 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -868,7 +868,7 @@ static void DRW_shgroup_empty_image( { /* TODO: 'StereoViews', see draw_empty_image. */ - if (!BKE_image_empty_visible_in_view3d(ob, rv3d)) + if (!BKE_object_empty_image_is_visible_in_view3d(ob, rv3d)) return; GPUTexture *tex = ob->data ? diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index b358f87bb26..f9a96803661 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -3401,7 +3401,8 @@ static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat ui_but_v3_get(but, col); if ((state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_OVERRIDEN | UI_BUT_REDALERT)) || - (but->drawflag & UI_BUT_ANIMATED_CHANGED)) { + (but->drawflag & UI_BUT_ANIMATED_CHANGED)) + { /* draw based on state - color for keyed etc */ widgetbase_draw(&wtb, wcol); diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c index 58cfeba0480..df1ae8c82e9 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_empty.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c @@ -122,7 +122,7 @@ static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmGizmoGroupType *UN if (ob && ob->type == OB_EMPTY) { if (ob->empty_drawtype == OB_EMPTY_IMAGE) { - return BKE_image_empty_visible_in_view3d(ob, rv3d); + return BKE_object_empty_image_is_visible_in_view3d(ob, rv3d); } } return false; |