Cleanup: use BKE_object_* prefix for object API

Also minor style cleanup.

1 files changed, 18 insertions, 19 deletions

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