diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 46977d780f6..287fa50d70a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -931,9 +931,9 @@ ENDIF(WITH_CXX_GUARDEDALLOC) #----------------------------------------------------------------------------- # Libraries FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "") +ADD_SUBDIRECTORY(source) ADD_SUBDIRECTORY(intern) ADD_SUBDIRECTORY(extern) -ADD_SUBDIRECTORY(source) #----------------------------------------------------------------------------- diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index e991c4fc3fa..ea99844bfac 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -253,7 +253,7 @@ static void make_snap(Snapshot* snap, Brush* brush, ViewContext* vc) snap->winy = vc->ar->winy; } -static int load_tex(Brush* br, ViewContext* vc) +static int load_tex(Sculpt *sd, Brush* br, ViewContext* vc) { static GLuint overlay_texture = 0; static int init = 0; @@ -268,8 +268,12 @@ static int load_tex(Brush* br, ViewContext* vc) 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 = !overlay_texture || (br->mtex.tex && @@ -611,7 +615,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *unused) GL_VIEWPORT_BIT| GL_TEXTURE_BIT); - if (load_tex(brush, &vc)) { + if (load_tex(sd, brush, &vc)) { glEnable(GL_BLEND); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); |