[Bf-blender-cvs] [28a5e2437c0] blender2.8: External engine: Cleanup, use lower case prefix for private functions

Sergey Sharybin noreply at git.blender.org
Wed Nov 29 12:55:37 CET 2017


Commit: 28a5e2437c09150df44f15259090c1a05202b993
Author: Sergey Sharybin
Date:   Wed Nov 29 12:30:55 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB28a5e2437c09150df44f15259090c1a05202b993

External engine: Cleanup, use lower case prefix for private functions

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

M	source/blender/draw/engines/external/external_engine.c

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

diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c
index 2127dbe1f63..851d0ef9eb7 100644
--- a/source/blender/draw/engines/external/external_engine.c
+++ b/source/blender/draw/engines/external/external_engine.c
@@ -96,7 +96,7 @@ typedef struct EXTERNAL_PrivateData {
 
 /* Functions */
 
-static void EXTERNAL_engine_init(void *UNUSED(vedata))
+static void external_engine_init(void *UNUSED(vedata))
 {
 	/* Depth prepass */
 	if (!e_data.depth_sh) {
@@ -104,7 +104,7 @@ static void EXTERNAL_engine_init(void *UNUSED(vedata))
 	}
 }
 
-static void EXTERNAL_cache_init(void *vedata)
+static void external_cache_init(void *vedata)
 {
 	EXTERNAL_PassList *psl = ((EXTERNAL_Data *)vedata)->psl;
 	EXTERNAL_StorageList *stl = ((EXTERNAL_Data *)vedata)->stl;
@@ -121,7 +121,7 @@ static void EXTERNAL_cache_init(void *vedata)
 	}
 }
 
-static void EXTERNAL_cache_populate(void *vedata, Object *ob)
+static void external_cache_populate(void *vedata, Object *ob)
 {
 	EXTERNAL_StorageList *stl = ((EXTERNAL_Data *)vedata)->stl;
 
@@ -135,11 +135,11 @@ static void EXTERNAL_cache_populate(void *vedata, Object *ob)
 	}
 }
 
-static void EXTERNAL_cache_finish(void *UNUSED(vedata))
+static void external_cache_finish(void *UNUSED(vedata))
 {
 }
 
-static void external_draw_scene(void *vedata)
+static void external_draw_scene_do(void *vedata)
 {
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	Scene *scene = draw_ctx->scene;
@@ -184,7 +184,7 @@ static void external_draw_scene(void *vedata)
 	}
 }
 
-static void EXTERNAL_draw_scene(void *vedata)
+static void external_draw_scene(void *vedata)
 {
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	EXTERNAL_PassList *psl = ((EXTERNAL_Data *)vedata)->psl;
@@ -193,29 +193,29 @@ static void EXTERNAL_draw_scene(void *vedata)
 	 * OpenGL render is used for quick preview (thumbnails or sequencer preview)
 	 * where using the rendering engine to preview doesn't make so much sense. */
 	if (draw_ctx->evil_C) {
-		external_draw_scene(vedata);
+		external_draw_scene_do(vedata);
 	}
 	DRW_draw_pass(psl->depth_pass);
 }
 
-static void EXTERNAL_engine_free(void)
+static void external_engine_free(void)
 {
 	/* All shaders are builtin. */
 }
 
-static const DrawEngineDataSize EXTERNAL_data_size = DRW_VIEWPORT_DATA_SIZE(EXTERNAL_Data);
+static const DrawEngineDataSize external_data_size = DRW_VIEWPORT_DATA_SIZE(EXTERNAL_Data);
 
 DrawEngineType draw_engine_external_type = {
 	NULL, NULL,
 	N_("External"),
-	&EXTERNAL_data_size,
-	&EXTERNAL_engine_init,
-	&EXTERNAL_engine_free,
-	&EXTERNAL_cache_init,
-	&EXTERNAL_cache_populate,
-	&EXTERNAL_cache_finish,
+	&external_data_size,
+	&external_engine_init,
+	&external_engine_free,
+	&external_cache_init,
+	&external_cache_populate,
+	&external_cache_finish,
 	NULL,
-	&EXTERNAL_draw_scene,
+	&external_draw_scene,
 	NULL,
 	NULL,
 };



More information about the Bf-blender-cvs mailing list