[Bf-blender-cvs] [0e06f4c] temp-ui-widget-refactor: Fix weirdly appearing and disappearing compile error

[Julian Eisel]

Commit: 0e06f4c491a457ae9e950493c27a63f9fe36009b
Author: Julian Eisel
Date:   Tue Jul 14 21:06:59 2015 +0200
Branches: temp-ui-widget-refactor
https://developer.blender.org/rB0e06f4c491a457ae9e950493c27a63f9fe36009b

Fix weirdly appearing and disappearing compile error

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

M       source/blender/editors/interface/widgets/widgets.h
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.h 
b/source/blender/editors/interface/widgets/widgets.h
index ca63f1d..9fce467 100644
--- a/source/blender/editors/interface/widgets/widgets.h
+++ b/source/blender/editors/interface/widgets/widgets.h
@@ -39,11 +39,11 @@ struct uiWidgetType;
 
 typedef struct uiWidgetDrawType {
        void (*state)(struct uiWidgetType *, int state);
-       void (*draw)(uiWidgetColors *, rcti *, int state, int roundboxalign);
+       void (*draw)(struct uiWidgetColors *, rcti *, int state, int 
roundboxalign);
        /* XXX uiBut and uiFontStyle shouldn't be needed/used at this level,
         * the needed data should be transferred using uiWidget API instead */
-       void (*custom)(struct uiBut *, uiWidgetColors *, rcti *, int state, int 
roundboxalign);
-       void (*text)(struct uiFontStyle *, uiWidgetColors *, struct uiBut *, 
rcti *);
+       void (*custom)(struct uiBut *, struct uiWidgetColors *, rcti *, int 
state, int roundboxalign);
+       void (*text)(struct uiFontStyle *, struct uiWidgetColors *, struct 
uiBut *, rcti *);
 } uiWidgetDrawType;
 
 #if 0 /* uiWidgetDrawType init template */
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 504cd79..49bb08e 100644
--- a/source/blender/editors/interface/widgets/widgets_draw/widgets_draw.c
+++ b/source/blender/editors/interface/widgets/widgets_draw/widgets_draw.c
@@ -32,6 +32,7 @@
 #include "BLI_math.h"
 #include "BLI_rect.h"
 
+#include "DNA_userdef_types.h"
 #include "DNA_screen_types.h"
 
 #include "UI_interface.h"
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 9f19492..8454ff2 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
@@ -94,7 +94,7 @@ void widget_check_trias(uiWidgetTrias *tria, const rcti 
*rect);
 
 void widget_softshadow(const rcti *rect, int roundboxalign, const float radin);
 
-void widgetbase_draw(uiWidgetBase *wtb, uiWidgetColors *wcol);
+void widgetbase_draw(uiWidgetBase *wtb, struct uiWidgetColors *wcol);
 
 #endif  /* __WIDGETS_DRAW_INTERN_H__ */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs