Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-08-09 15:32:55 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-08-09 15:32:55 +0400
commitdd75ec490761640571a0d8e53a0d439091f2736f (patch)
tree25b3966862febbf3ee8c81ed45f7045c99f84016 /source/blender/windowmanager/intern/wm_operators.c
parent02b0967bd11dd6fd2454b37182d9f94ea451b603 (diff)
parentc026b8066ddc1c42144d2e5132384ea7c1211050 (diff)
Merged changes in the trunk up to revision 31190.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_operators.c')
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 2ab0a055156..4c3e88d978e 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -35,6 +35,7 @@
#include "DNA_object_types.h"
#include "DNA_screen_types.h"
#include "DNA_scene_types.h"
+#include "DNA_brush_types.h"
#include "DNA_userdef_types.h"
#include "DNA_windowmanager_types.h"
@@ -2612,7 +2613,7 @@ static void wm_radial_control_paint(bContext *C, int x, int y, void *customdata)
float r1=0.0f, r2=0.0f, r3=0.0f, angle=0.0f;
Paint *paint = paint_get_active(CTX_data_scene(C));
- Brush *brush = paint_brush(paint);
+ struct Brush *brush = paint_brush(paint);
ViewContext vc;