[Bf-blender-cvs] [b3ef5a04d15] blender2.8: Cleanup: Use uppercase UI_ prefix for external functions

Julian Eisel noreply at git.blender.org
Thu Mar 29 17:25:39 CEST 2018


Commit: b3ef5a04d153c9b3b6af3a3c12cc62e2b99ad9e4
Author: Julian Eisel
Date:   Thu Mar 29 17:21:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb3ef5a04d153c9b3b6af3a3c12cc62e2b99ad9e4

Cleanup: Use uppercase UI_ prefix for external functions

Using uppercase prefixes is our convention for external functions.
"External" as in functions exposed to the outside of interface/ directory.

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

M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface_widgets.c
M	source/blender/gpu/intern/gpu_batch_presets.c
M	source/blenderplayer/bad_level_call_stubs/stubs.c

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

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 2a0181876c7..eba3be327dd 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -1169,7 +1169,7 @@ void UI_tooltip_free(struct bContext *C, struct bScreen *sc, struct ARegion *ar)
 int UI_calc_float_precision(int prec, double value);
 
 /* UI Batches managment */
-void ui_widget_batch_preset_reset(void);
-void ui_widget_batch_preset_exit(void);
+void UI_widget_batch_preset_reset(void);
+void UI_widget_batch_preset_exit(void);
 
 #endif  /* __UI_INTERFACE_H__ */
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 60feaa74c01..7c0fa271607 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -327,14 +327,14 @@ static Gwn_Batch *ui_batch_roundbox_get(void)
 #undef EMBOSS
 #undef NO_AA
 
-void ui_widget_batch_preset_reset(void)
+void UI_widget_batch_preset_reset(void)
 {
 	if (g_ui_batch_cache.roundbox) {
 		gwn_batch_vao_cache_clear(g_ui_batch_cache.roundbox);
 	}
 }
 
-void ui_widget_batch_preset_exit(void)
+void UI_widget_batch_preset_exit(void)
 {
 	GWN_BATCH_DISCARD_SAFE(g_ui_batch_cache.roundbox);
 }
diff --git a/source/blender/gpu/intern/gpu_batch_presets.c b/source/blender/gpu/intern/gpu_batch_presets.c
index 1eb1b737bee..144c4a33787 100644
--- a/source/blender/gpu/intern/gpu_batch_presets.c
+++ b/source/blender/gpu/intern/gpu_batch_presets.c
@@ -205,7 +205,7 @@ void gpu_batch_presets_reset(void)
 	gwn_batch_vao_cache_clear(g_presets_3d.batch.sphere_wire_low);
 	gwn_batch_vao_cache_clear(g_presets_3d.batch.sphere_wire_med);
 
-	ui_widget_batch_preset_reset();
+	UI_widget_batch_preset_reset();
 }
 
 void gpu_batch_presets_exit(void)
@@ -216,5 +216,5 @@ void gpu_batch_presets_exit(void)
 	GWN_batch_discard(g_presets_3d.batch.sphere_wire_low);
 	GWN_batch_discard(g_presets_3d.batch.sphere_wire_med);
 
-	ui_widget_batch_preset_exit();
+	UI_widget_batch_preset_exit();
 }
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 195e04923d9..e9bda211f09 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -676,8 +676,8 @@ void UI_GetThemeColorBlendShade3fv(int colorid1, int colorid2, float fac, int of
 void UI_GetThemeColorBlendShade4fv(int colorid1, int colorid2, float fac, int offset, float col[4]) RET_NONE
 void UI_GetThemeColorBlend3ubv(int colorid1, int colorid2, float fac, unsigned char col[3]) RET_NONE
 void UI_GetThemeColorShadeAlpha4ubv(int colorid, int coloffset, int alphaoffset, unsigned char col[4]) RET_NONE
-void ui_widget_batch_preset_reset(void) RET_NONE
-void ui_widget_batch_preset_exit(void) RET_NONE
+void UI_widget_batch_preset_reset(void) RET_NONE
+void UI_widget_batch_preset_exit(void) RET_NONE
 
 /* rna template */
 void uiTemplateAnyID(uiLayout *layout, struct PointerRNA *ptr, const char *propname, const char *proptypename, const char *text) RET_NONE



More information about the Bf-blender-cvs mailing list