[Bf-blender-cvs] [e022e44] temp-ui-widget-refactor: Minor Cleanup
Julian Eisel
noreply at git.blender.org
Sun Aug 2 23:58:49 CEST 2015
Commit: e022e44af07ee0497904988df9e518690fa9cb88
Author: Julian Eisel
Date: Sun Aug 2 23:57:51 2015 +0200
Branches: temp-ui-widget-refactor
https://developer.blender.org/rBe022e44af07ee0497904988df9e518690fa9cb88
Minor Cleanup
===================================================================
M source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c
M source/blender/editors/interface/widgets/widgets_draw/widgets_draw.c
M source/blender/editors/interface/widgets/widgets_draw/widgets_draw_intern.h
===================================================================
diff --git a/source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c b/source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c
index c3347ed..98c2ed4 100644
--- a/source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c
+++ b/source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c
@@ -46,7 +46,7 @@
#include "UI_interface.h"
-#include "../interface_intern.h" /* XXX */
+#include "../interface_intern.h" /* XXX currently needed, but not so nice on this level */
#include "widgets.h"
diff --git a/source/blender/editors/interface/widgets/widgets_draw/widgets_draw.c b/source/blender/editors/interface/widgets/widgets_draw/widgets_draw.c
index 8d484e8..ce7b450 100644
--- a/source/blender/editors/interface/widgets/widgets_draw/widgets_draw.c
+++ b/source/blender/editors/interface/widgets/widgets_draw/widgets_draw.c
@@ -318,8 +318,7 @@ static void widget_verts_to_triangle_strip_open(uiWidgetDrawBase *wtb, const int
}
/* based on button rect, return scaled array of triangles */
-/* XXX tmp, could be static */
-/* static */ void widget_drawbase_tria_ex(
+static void widget_drawbase_tria_ex(
uiWidgetDrawBaseTrias *tria, const rcti *rect, float triasize, char where,
/* input data */
const float verts[][2], const int verts_tot,
diff --git a/source/blender/editors/interface/widgets/widgets_draw/widgets_draw_intern.h b/source/blender/editors/interface/widgets/widgets_draw/widgets_draw_intern.h
index 12ad204..584aba1 100644
--- a/source/blender/editors/interface/widgets/widgets_draw/widgets_draw_intern.h
+++ b/source/blender/editors/interface/widgets/widgets_draw/widgets_draw_intern.h
@@ -84,12 +84,6 @@ void widget_drawbase_init(uiWidgetDrawBase *wtb);
void widget_drawbase_roundboxedges_set(uiWidgetDrawBase *wt, int roundboxalign, const rcti *rect, float rad);
void round_box__edges(uiWidgetDrawBase *wt, int roundboxalign, const rcti *rect, float rad, float radi);
-
-void widget_drawbase_tria_ex( /* XXX tmp, could be static */
- uiWidgetDrawBaseTrias *tria, const rcti *rect, float triasize, char where,
- /* input data */
- const float verts[][2], const int verts_tot,
- const unsigned int tris[][3], const int tris_tot);
void widget_drawbase_num_tria(uiWidgetDrawBaseTrias *tria, const rcti *rect, float triasize, char where);
void widget_drawbase_menu_trias(uiWidgetDrawBaseTrias *tria, const rcti *rect);
void widget_drawbase_check_trias(uiWidgetDrawBaseTrias *tria, const rcti *rect);
More information about the Bf-blender-cvs
mailing list