[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32486] trunk/blender: fix for own recent unused commit that broke with OpenMP enabled.
Campbell Barton
ideasman42 at gmail.com
Fri Oct 15 09:26:45 CEST 2010
Revision: 32486
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32486
Author: campbellbarton
Date: 2010-10-15 09:26:26 +0200 (Fri, 15 Oct 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-10-15 05:27:57 UTC (rev 32485)
+++ trunk/blender/CMakeLists.txt 2010-10-15 07:26:26 UTC (rev 32486)
@@ -931,9 +931,9 @@
#-----------------------------------------------------------------------------
# Libraries
FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
+ADD_SUBDIRECTORY(source)
ADD_SUBDIRECTORY(intern)
ADD_SUBDIRECTORY(extern)
-ADD_SUBDIRECTORY(source)
#-----------------------------------------------------------------------------
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2010-10-15 05:27:57 UTC (rev 32485)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2010-10-15 07:26:26 UTC (rev 32486)
@@ -253,7 +253,7 @@
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 @@
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 @@
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);
More information about the Bf-blender-cvs
mailing list