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

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