diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2011-05-25 02:51:46 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2011-05-25 02:51:46 +0400 |
| commit | f05b333c43a3583750747db9e4393ce76ce76bf1 (patch) | |
| tree | 66061ad3f0b8ef4aec3bf25f8e266662ed54f24f /source/blender/editors/sculpt_paint/paint_stroke.c | |
| parent | ef3101f6149835ac77a35baa91b352f2913c147e (diff) | |
| parent | f48f8d3bbc943525ce1b4db9d58e0d2cc76b5995 (diff) | |
Merged with trunk: 32509-33092
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_stroke.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index cc466332b2e..54f15763301 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -256,7 +256,7 @@ static void make_snap(Snapshot* snap, Brush* brush, ARegion *ar) snap->winy = ar->winy; } -static int paint_load_overlay_tex(Sculpt *sd, Brush* br, ARegion *ar) +static int load_tex(Sculpt *sd, Brush* br, ViewContext* vc) { static GLuint overlay_texture = 0; static int init = 0; @@ -271,6 +271,10 @@ static int paint_load_overlay_tex(Sculpt *sd, Brush* br, ARegion *ar) int j; int refresh; +#ifndef _OPENMP + (void)sd; /* quied unused warning */ +#endif + if (br->mtex.brush_map_mode == MTEX_MAP_MODE_TILED && !br->mtex.tex) return 0; refresh = |