archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use BKE_object_* prefix for object API

Browse Source 
Also minor style cleanup.
This commit is contained in:
Campbell Barton
2018-12-11 15:08:18 +11:00
parent 7fe3d1e7d7
commit c7ec1fa5e6
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_object.h
View File

@@ -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
}

37
source/blender/blenkernel/intern/object.c
View File

@@ -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;
}
}

4
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@@ -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;
}

2
source/blender/draw/modes/object_mode.c
View File

@@ -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 ?

3
source/blender/editors/interface/interface_widgets.c
View File

@@ -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);

2
source/blender/editors/space_view3d/view3d_gizmo_empty.c
View File

@@ -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;