[Bf-blender-cvs] [d2bd9195d4b] blender2.8: Cleanup: naming

[Campbell Barton]

Commit: d2bd9195d4b9a5ba05b674e34ba92a81d3bcd9e2
Author: Campbell Barton
Date:   Mon May 8 11:15:28 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBd2bd9195d4b9a5ba05b674e34ba92a81d3bcd9e2

Cleanup: naming

===================================================================

M	source/blender/draw/engines/basic/basic_engine.c
M	source/blender/draw/engines/clay/clay_engine.c
M	source/blender/draw/engines/external/external_engine.c
M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager.c

===================================================================

diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index 16d9ca3ef0d..e10eaaac128 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -178,7 +178,7 @@ static void BASIC_cache_populate(void *vedata, Object *ob)
 {
 	BASIC_StorageList *stl = ((BASIC_Data *)vedata)->stl;
 
-	if (!DRW_is_object_renderable(ob))
+	if (!DRW_object_is_renderable(ob))
 		return;
 
 	struct Batch *geom = DRW_cache_object_surface_get(ob);
diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c
index f7ca64e6288..fee1849f6e2 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -573,7 +573,7 @@ static void CLAY_cache_populate(void *vedata, Object *ob)
 
 	DRWShadingGroup *clay_shgrp;
 
-	if (!DRW_is_object_renderable(ob))
+	if (!DRW_object_is_renderable(ob))
 		return;
 
 	struct Batch *geom = DRW_cache_object_surface_get(ob);
diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c
index 3b7595d18d1..f94194e29fc 100644
--- a/source/blender/draw/engines/external/external_engine.c
+++ b/source/blender/draw/engines/external/external_engine.c
@@ -125,7 +125,7 @@ static void EXTERNAL_cache_populate(void *vedata, Object *ob)
 {
 	EXTERNAL_StorageList *stl = ((EXTERNAL_Data *)vedata)->stl;
 
-	if (!DRW_is_object_renderable(ob))
+	if (!DRW_object_is_renderable(ob))
 		return;
 
 	struct Batch *geom = DRW_cache_object_surface_get(ob);
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 9eb6ed86cd2..8db189022cb 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -318,7 +318,7 @@ struct LampEngineData *DRW_lamp_engine_data_get(Object *ob, struct RenderEngineT
 void DRW_lamp_engine_data_free(struct LampEngineData *led);
 
 /* Settings */
-bool DRW_is_object_renderable(struct Object *ob);
+bool DRW_object_is_renderable(struct Object *ob);
 
 /* Draw commands */
 void DRW_draw_pass(DRWPass *pass);
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 12300ee6d00..52b44039c0f 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1607,7 +1607,7 @@ struct DRWTextStore *DRW_text_cache_ensure(void)
 /** \name Settings
  * \{ */
 
-bool DRW_is_object_renderable(Object *ob)
+bool DRW_object_is_renderable(Object *ob)
 {
 	Scene *scene = DST.draw_ctx.scene;
 	Object *obedit = scene->obedit;