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 /source/blender/editors | |
| parent | 7fe3d1e7d718561e275f21acc7261207e67bf685 (diff) | |
Cleanup: use BKE_object_* prefix for object API
Also minor style cleanup.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_gizmo_empty.c | 2 |
2 files changed, 3 insertions, 2 deletions
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; |