[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60119] branches/soc-2013-bge/source/ blender: Renaming BKE_object_lod_check to BKE_object_lod_is_usable to make what is being checked more clear .

[Daniel Stokes]

Revision: 60119
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60119
Author:   kupoman
Date:     2013-09-13 23:07:13 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
Renaming BKE_object_lod_check to BKE_object_lod_is_usable to make what is being checked more clear.

Modified Paths:
--------------
    branches/soc-2013-bge/source/blender/blenkernel/BKE_object.h
    branches/soc-2013-bge/source/blender/blenkernel/intern/object.c
    branches/soc-2013-bge/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-bge/source/blender/gpu/intern/gpu_draw.c

Modified: branches/soc-2013-bge/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2013-bge/source/blender/blenkernel/BKE_object.h	2013-09-13 21:42:52 UTC (rev 60118)
+++ branches/soc-2013-bge/source/blender/blenkernel/BKE_object.h	2013-09-13 23:07:13 UTC (rev 60119)
@@ -87,7 +87,7 @@
 void BKE_object_lod_add(struct Object *ob);
 bool BKE_object_lod_remove(struct Object *ob, int level);
 bool BKE_object_lod_update(struct Object *ob, float camera_position[3]);
-bool BKE_object_lod_check(struct Object *ob, struct Scene *scene);
+bool BKE_object_lod_is_usable(struct Object *ob, struct Scene *scene);
 struct Object *BKE_object_lod_meshob_get(struct Object *ob);
 struct Object *BKE_object_lod_matob_get(struct Object *ob);
 

Modified: branches/soc-2013-bge/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2013-bge/source/blender/blenkernel/intern/object.c	2013-09-13 21:42:52 UTC (rev 60118)
+++ branches/soc-2013-bge/source/blender/blenkernel/intern/object.c	2013-09-13 23:07:13 UTC (rev 60119)
@@ -1054,7 +1054,7 @@
 	return current;
 }
 
-bool BKE_object_lod_check(struct Object *ob, struct Scene *scene)
+bool BKE_object_lod_is_usable(struct Object *ob, struct Scene *scene)
 {
 	bool active = (scene) ? ob == OBACT : 0;
 	return (ob->mode == OB_MODE_OBJECT || !active);

Modified: branches/soc-2013-bge/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/soc-2013-bge/source/blender/editors/space_view3d/drawobject.c	2013-09-13 21:42:52 UTC (rev 60118)
+++ branches/soc-2013-bge/source/blender/editors/space_view3d/drawobject.c	2013-09-13 23:07:13 UTC (rev 60119)
@@ -3368,7 +3368,7 @@
 	const bool is_obact = (ob == OBACT);
 	int draw_flags = (is_obact && paint_facesel_test(ob)) ? DRAW_FACE_SELECT : 0;
 
-	if (BKE_object_lod_check(ob, scene)) {
+	if (BKE_object_lod_is_usable(ob, scene)) {
 		ob = BKE_object_lod_meshob_get(ob);
 		if (!ob) ob = base->object;
 		me = ob->data;

Modified: branches/soc-2013-bge/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- branches/soc-2013-bge/source/blender/gpu/intern/gpu_draw.c	2013-09-13 21:42:52 UTC (rev 60118)
+++ branches/soc-2013-bge/source/blender/gpu/intern/gpu_draw.c	2013-09-13 23:07:13 UTC (rev 60119)
@@ -1389,7 +1389,7 @@
 	int new_shading_nodes = BKE_scene_use_new_shading_nodes(scene);
 	int use_matcap = (v3d->flag2 & V3D_SHOW_SOLID_MATCAP); /* assumes v3d->defmaterial->preview is set */
 
-	if (BKE_object_lod_check(ob, scene)) {
+	if (BKE_object_lod_is_usable(ob, scene)) {
 		Object *tmp = BKE_object_lod_matob_get(ob);
 		if (tmp) ob = tmp;
 	}