Cleanup: use BKE_object_* prefix for object API
Also minor style cleanup.
This commit is contained in:
@@ -351,7 +351,7 @@ bool BKE_object_modifier_update_subframe(
|
|||||||
|
|
||||||
void BKE_object_type_set_empty_for_versioning(struct Object *ob);
|
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
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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 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;
|
bool ok = false;
|
||||||
@@ -4048,7 +4066,6 @@ bool BKE_object_modifier_update_subframe(
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void BKE_object_type_set_empty_for_versioning(Object *ob)
|
void BKE_object_type_set_empty_for_versioning(Object *ob)
|
||||||
{
|
{
|
||||||
ob->type = OB_EMPTY;
|
ob->type = OB_EMPTY;
|
||||||
@@ -4059,21 +4076,3 @@ void BKE_object_type_set_empty_for_versioning(Object *ob)
|
|||||||
}
|
}
|
||||||
ob->mode = OB_MODE_OBJECT;
|
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -3809,8 +3809,8 @@ static void mesh_create_edit_tris_and_verts(
|
|||||||
if (p_orig != ORIGINDEX_NONE) {
|
if (p_orig != ORIGINDEX_NONE) {
|
||||||
BMFace *efa = BM_face_at_index(bm, p_orig);
|
BMFace *efa = BM_face_at_index(bm, p_orig);
|
||||||
if (add_edit_tri_mapped(rdata, vbo_pos_nor, vbo_lnor, vbo_data, elbp,
|
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,
|
attr_id.pos, attr_id.vnor, attr_id.lnor, attr_id.data,
|
||||||
efa, mlt, polynors, loopnors, tri_len_used))
|
efa, mlt, polynors, loopnors, tri_len_used))
|
||||||
{
|
{
|
||||||
tri_len_used += 3;
|
tri_len_used += 3;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -868,7 +868,7 @@ static void DRW_shgroup_empty_image(
|
|||||||
{
|
{
|
||||||
/* TODO: 'StereoViews', see draw_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;
|
return;
|
||||||
|
|
||||||
GPUTexture *tex = ob->data ?
|
GPUTexture *tex = ob->data ?
|
||||||
|
|||||||
@@ -3401,7 +3401,8 @@ static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
|
|||||||
ui_but_v3_get(but, col);
|
ui_but_v3_get(but, col);
|
||||||
|
|
||||||
if ((state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_OVERRIDEN | UI_BUT_REDALERT)) ||
|
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 */
|
/* draw based on state - color for keyed etc */
|
||||||
widgetbase_draw(&wtb, wcol);
|
widgetbase_draw(&wtb, wcol);
|
||||||
|
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmGizmoGroupType *UN
|
|||||||
|
|
||||||
if (ob && ob->type == OB_EMPTY) {
|
if (ob && ob->type == OB_EMPTY) {
|
||||||
if (ob->empty_drawtype == OB_EMPTY_IMAGE) {
|
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;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user