Revision: 30319
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30319
Author: jwilkins
Date: 2010-07-14 13:56:05 +0200 (Wed, 14 Jul 2010)
Log Message:
-----------
*** DO NOT DISTRIBUTE THIS VERSION ***
Clay brush is disabled and On-Surface Brush is removed.
This version created for merging with the trunk.
Next version will revert to previous version.
Modified Paths:
--------------
branches/soc-2010-jwilkins/CMakeLists.txt
branches/soc-2010-jwilkins/intern/ghost/SConscript
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/SConscript
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-jwilkins/source/blender/makesrna/SConscript
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-jwilkins/source/blender/windowmanager/SConscript
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-14 11:44:05 UTC (rev
30318)
+++ branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-14 11:56:05 UTC (rev
30319)
@@ -117,7 +117,6 @@
OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the
raytracer" ON)
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation
tracking" OFF)
OPTION(WITH_INSTALL "Install accompanying scripts and language files
needed to run blender" ON)
-OPTION(WITH_ONSURFACEBRUSH "Enable use of the 'on-surface brush' for
paint/sculpt. Requires a stencil buffer, GL_depth_texture, and GLSL" ON)
IF(APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated
Carbon" ON)
@@ -318,10 +317,6 @@
ADD_DEFINITIONS(-D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- IF(WITH_ONSURFACEBRUSH)
- ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
- ENDIF(WITH_ONSURFACEBRUSH)
-
SET(PLATFORM_LINKFLAGS "-pthread")
# Better warnings
@@ -411,10 +406,6 @@
ADD_DEFINITIONS(-D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- IF(WITH_ONSURFACEBRUSH)
- ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
- ENDIF(WITH_ONSURFACEBRUSH)
-
IF(MSVC)
IF(CMAKE_CL_64)
SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
@@ -823,10 +814,6 @@
ADD_DEFINITIONS(-D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- IF(WITH_ONSURFACEBRUSH)
- ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
- ENDIF(WITH_ONSURFACEBRUSH)
-
SET(EXETYPE MACOSX_BUNDLE)
SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
Modified: branches/soc-2010-jwilkins/intern/ghost/SConscript
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/SConscript 2010-07-14 11:44:05 UTC
(rev 30318)
+++ branches/soc-2010-jwilkins/intern/ghost/SConscript 2010-07-14 11:56:05 UTC
(rev 30319)
@@ -57,9 +57,6 @@
if env['BF_GHOST_DEBUG']:
defs.append('BF_GHOST_DEBUG')
-if env['WITH_BF_ONSURFACEBRUSH']:
- defs.append('WITH_ONSURFACEBRUSH')
-
incs = '. ../string #extern/glew/include #source/blender/imbuf
#source/blender/makesdna ' + env['BF_OPENGL_INC']
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross',
'win64-vc'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCarbon.cpp
2010-07-14 11:44:05 UTC (rev 30318)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCarbon.cpp
2010-07-14 11:56:05 UTC (rev 30319)
@@ -47,9 +47,6 @@
AGL_DOUBLEBUFFER,
AGL_ACCELERATED,
AGL_DEPTH_SIZE, 32,
-#ifdef WITH_ONSURFACEBRUSH
-AGL_STENCIL_SIZE, 8,
-#endif
AGL_NONE,
};
@@ -59,9 +56,6 @@
AGL_ACCELERATED,
AGL_FULLSCREEN,
AGL_DEPTH_SIZE, 32,
-#ifdef WITH_ONSURFACEBRUSH
-AGL_STENCIL_SIZE, 8,
-#endif
AGL_NONE,
};
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCocoa.mm
2010-07-14 11:44:05 UTC (rev 30318)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowCocoa.mm
2010-07-14 11:56:05 UTC (rev 30319)
@@ -349,11 +349,6 @@
pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
//pixelFormatAttrsWindow[i++] = NSOpenGLPFAAllowOfflineRenderers,; //
Removed to allow 10.4 builds, and 2 GPUs rendering is not used anyway
-#ifdef WITH_ONSURFACEBRUSH
- pixelFormatAttrsWindow[i++] = NSOpenGLPFAStencilSize;
- pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 8;
-#endif
-
pixelFormatAttrsWindow[i++] = NSOpenGLPFADepthSize;
pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 32;
@@ -364,11 +359,6 @@
// Multisample anti-aliasing
pixelFormatAttrsWindow[i++] = NSOpenGLPFAMultisample;
-#ifdef WITH_ONSURFACEBRUSH
- pixelFormatAttrsWindow[i++] = NSOpenGLPFAStencilSize;
- pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 8;
-#endif
-
pixelFormatAttrsWindow[i++] = NSOpenGLPFASampleBuffers;
pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 1;
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp
2010-07-14 11:44:05 UTC (rev 30318)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp
2010-07-14 11:56:05 UTC (rev 30319)
@@ -93,11 +93,7 @@
0, /* no accumulation buffer */
0, 0, 0, 0, /* accum bits (ignored) */
32, /* depth buffer */
-#ifdef WITH_ONSURFACEBRUSH
- 8, /* stencil buffer */
-#else
0, /* no stencil buffer */
-#endif
0, /* no auxiliary buffers */
PFD_MAIN_PLANE, /* main layer */
0, /* reserved */
@@ -1097,11 +1093,7 @@
!(pfd.dwFlags & PFD_DRAW_TO_WINDOW) ||
!(pfd.dwFlags & PFD_DOUBLEBUFFER) || /* Blender _needs_ this */
( pfd.cDepthBits <= 8 ) ||
- !(pfd.iPixelType == PFD_TYPE_RGBA)
-#ifdef WITH_ONSURFACEBRUSH
- || ( pfd.cStencilBits == 0)
-#endif
- )
+ !(pfd.iPixelType == PFD_TYPE_RGBA))
return 0;
weight = 1; /* it's usable */
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
2010-07-14 11:44:05 UTC (rev 30318)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowX11.cpp
2010-07-14 11:56:05 UTC (rev 30319)
@@ -196,9 +196,6 @@
attributes[i++] = GLX_BLUE_SIZE; attributes[i++] = 1;
attributes[i++] = GLX_GREEN_SIZE; attributes[i++] = 1;
attributes[i++] = GLX_DEPTH_SIZE; attributes[i++] = 1;
-#ifdef WITH_ONSURFACEBRUSH
- attributes[i++] = GLX_STENCIL_SIZE; attributes[i++] = 8;
-#endif
/* GLX >= 1.4 required for multi-sample */
if(samples && (glxVersionMajor >= 1) && (glxVersionMinor >= 4))
{
attributes[i++] = GLX_SAMPLE_BUFFERS; attributes[i++] =
1;
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
2010-07-14 11:44:05 UTC (rev 30318)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
2010-07-14 11:56:05 UTC (rev 30319)
@@ -338,10 +338,6 @@
col.prop(sculpt, "use_openmp", text="Threaded Sculpt")
col.prop(sculpt, "show_brush")
- row = col.row()
- row.active = sculpt.show_brush and sculpt.is_on_surface_brush_capable()
- row.prop(sculpt, "show_brush_on_surface")
-
col.separator()
col.separator()
col.separator()
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/SConscript
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/SConscript
2010-07-14 11:44:05 UTC (rev 30318)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/SConscript
2010-07-14 11:56:05 UTC (rev 30319)
@@ -21,7 +21,4 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
-if env['WITH_BF_ONSURFACEBRUSH']:
- defs.append('WITH_ONSURFACEBRUSH')
-
env.BlenderLib ( 'bf_editors_sculpt_paint', sources, Split(incs),
defines=defs, libtype=['core'], priority=[40] )
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
2010-07-14 11:44:05 UTC (rev 30318)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
2010-07-14 11:56:05 UTC (rev 30319)
@@ -95,7 +95,7 @@
void BRUSH_OT_scale_size(wmOperatorType *ot)
{
/* identifiers */
- ot->name= "Scale Brush Size";
+ ot->name= "Scale Sculpt/Paint Brush Size";
ot->description= "Change brush size by a scalar";
ot->idname= "BRUSH_OT_scale_size";
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
---
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
2010-07-14 11:44:05 UTC (rev 30318)
+++
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
2010-07-14 11:56:05 UTC (rev 30319)
@@ -727,135 +727,38 @@
if(!(paint->flags & PAINT_SHOW_BRUSH))
return;
-#ifdef WITH_ONSURFACEBRUSH
- if (paint->flags & PAINT_SHOW_BRUSH_ON_SURFACE) {
- const float max_thickness= 0.12;
- const float min_thickness= 0.06;
- const float thickness= 1.0 - min_thickness
- visual_strength*max_thickness;
- const float inner_radius= sd->draw_anchored ?
unprojected_radius : unprojected_radius*thickness;
- const float outer_radius= sd->draw_anchored ?
1.0f/thickness * unprojected_radius : unprojected_radius;
-
- GLUquadric* sphere;
-
- Object *ob= CTX_data_active_object(C);
-
- glPushAttrib(
- GL_COLOR_BUFFER_BIT|
- GL_CURRENT_BIT|
- GL_DEPTH_BUFFER_BIT|
- GL_ENABLE_BIT|
- GL_LINE_BIT|
- GL_POLYGON_BIT|
- GL_STENCIL_BUFFER_BIT|
- GL_TRANSFORM_BIT|
- GL_VIEWPORT_BIT|
- GL_TEXTURE_BIT);
-
- glColor4f(col[0], col[1], col[2], alpha);
-
- glEnable(GL_BLEND);
-
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glLoadMatrixf(modelview);
-
- if (sd->draw_anchored)
- glTranslatef(sd->anchored_location[0],
sd->anchored_location[1], sd->anchored_location[2]);
- else
- glTranslatef(location[0], location[1],
location[2]);
-
- glScalef(ob->size[0], ob->size[1], ob->size[2]);
-
- glMatrixMode(GL_PROJECTION);
- glPushMatrix();
- glLoadMatrixf(projection);
-
- glViewport(viewport[0], viewport[1],
viewport[2], viewport[3]);
-
- glColorMask(GL_FALSE, GL_FALSE, GL_FALSE,
GL_FALSE);
- glDepthMask(GL_FALSE);
-
- glDisable(GL_CULL_FACE);
-
- glEnable(GL_DEPTH_TEST);
-
- glClearStencil(0);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
