fix for own recent unused commit that broke with OpenMP enabled.
also build ./source/ first with cmake since testing new changes are most likely to be made here.
This commit is contained in:
parent
4e61d5420c
commit
271bbf4a0d
@ -931,9 +931,9 @@ ENDIF(WITH_CXX_GUARDEDALLOC)
|
|||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# Libraries
|
# Libraries
|
||||||
FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
|
FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
|
||||||
|
ADD_SUBDIRECTORY(source)
|
||||||
ADD_SUBDIRECTORY(intern)
|
ADD_SUBDIRECTORY(intern)
|
||||||
ADD_SUBDIRECTORY(extern)
|
ADD_SUBDIRECTORY(extern)
|
||||||
ADD_SUBDIRECTORY(source)
|
|
||||||
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
@ -253,7 +253,7 @@ static void make_snap(Snapshot* snap, Brush* brush, ViewContext* vc)
|
|||||||
snap->winy = vc->ar->winy;
|
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 GLuint overlay_texture = 0;
|
||||||
static int init = 0;
|
static int init = 0;
|
||||||
@ -268,8 +268,12 @@ static int load_tex(Brush* br, ViewContext* vc)
|
|||||||
int j;
|
int j;
|
||||||
int refresh;
|
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;
|
if (br->mtex.brush_map_mode == MTEX_MAP_MODE_TILED && !br->mtex.tex) return 0;
|
||||||
|
|
||||||
refresh =
|
refresh =
|
||||||
!overlay_texture ||
|
!overlay_texture ||
|
||||||
(br->mtex.tex &&
|
(br->mtex.tex &&
|
||||||
@ -611,7 +615,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *unused)
|
|||||||
GL_VIEWPORT_BIT|
|
GL_VIEWPORT_BIT|
|
||||||
GL_TEXTURE_BIT);
|
GL_TEXTURE_BIT);
|
||||||
|
|
||||||
if (load_tex(brush, &vc)) {
|
if (load_tex(sd, brush, &vc)) {
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
|
|
||||||
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
|
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
|
||||||
|
Loading…
Reference in New Issue
Block a user