[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36973] branches/soc-2010-jwilkins: !!Merge Complete!!
Jason Wilkins
Jason.A.Wilkins at gmail.com
Sat May 28 12:01:00 CEST 2011
Revision: 36973
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36973
Author: jwilkins
Date: 2011-05-28 10:01:00 +0000 (Sat, 28 May 2011)
Log Message:
-----------
!!Merge Complete!!
Compiles, cursory testing of on-surface brush, matcaps, and new texture mode.
Known Issue: new radial control does not seem to work with f-key resizing when 'lock size' is enabled. Need to check that this is not bug in trunk as well.
Modified Paths:
--------------
branches/soc-2010-jwilkins/CMakeLists.txt
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_main.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/material.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/paint.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c
Removed Paths:
-------------
branches/soc-2010-jwilkins/release/scripts/io/
branches/soc-2010-jwilkins/release/scripts/keyingsets/
branches/soc-2010-jwilkins/release/scripts/op/
branches/soc-2010-jwilkins/release/scripts/ui/
Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt 2011-05-28 09:59:34 UTC (rev 36972)
+++ branches/soc-2010-jwilkins/CMakeLists.txt 2011-05-28 10:01:00 UTC (rev 36973)
@@ -441,9 +441,6 @@
# GNU Compiler
if(CMAKE_COMPILER_IS_GNUCC)
set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
- if(WITH_ONSURFACEBRUSH)
- add_defintion(-DWITH_ONSURFACEBRUSH)
- endif(WITH_ONSURFACEBRUSH)
# Intel C++ Compiler
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
# think these next two are broken
@@ -538,10 +535,6 @@
add_definitions(-D__SSE__ -D__MMX__)
endif()
- if(WITH_ONSURFACEBRUSH)
- add_defintion(-DWITH_ONSURFACEBRUSH)
- endif(WITH_ONSURFACEBRUSH)
-
if(MSVC)
if(CMAKE_CL_64)
set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid )
@@ -996,6 +989,10 @@
endif()
endif()
+if(WITH_ONSURFACEBRUSH)
+ add_definitions(-DWITH_ONSURFACEBRUSH)
+endif(WITH_ONSURFACEBRUSH)
+
if(WITH_IMAGE_OPENJPEG)
if(UNIX AND NOT APPLE)
set(OPENJPEG /usr)
Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp 2011-05-28 09:59:34 UTC (rev 36972)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp 2011-05-28 10:01:00 UTC (rev 36973)
@@ -1284,7 +1284,6 @@
!(pfd.dwFlags & PFD_DRAW_TO_WINDOW) ||
!(pfd.dwFlags & PFD_DOUBLEBUFFER) || /* Blender _needs_ this */
( pfd.cDepthBits <= 8 ) ||
- !(pfd.iPixelType == PFD_TYPE_RGBA))
!(pfd.iPixelType == PFD_TYPE_RGBA)
#ifdef WITH_ONSURFACEBRUSH
|| ( pfd.cStencilBits == 0)
Modified: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_view3d.py 2011-05-28 09:59:34 UTC (rev 36972)
+++ branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_view3d.py 2011-05-28 10:01:00 UTC (rev 36973)
@@ -2137,6 +2137,21 @@
row.prop(region, "use_box_clip")
+class VIEW3D_PT_view3d_matcap(bpy.types.Panel):
+ bl_space_type = 'VIEW_3D'
+ bl_region_type = 'UI'
+ bl_label = "MatCap"
+ bl_default_closed = True
+
+ @classmethod
+ def poll(self, context):
+ return (context.space_data)
+
+ def draw(self, context):
+ #self.layout.column().template_ID_preview(context.space_data, "matcap_image", open="image.open", new="image.new", filter="is_matcap_image", rows=3, cols=3)
+ self.layout.column().template_ID_preview(context.space_data, "matcap_image", open="image.open", new="image.new", rows=3, cols=3)
+
+
class VIEW3D_PT_view3d_meshdisplay(bpy.types.Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
Modified: branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-05-28 09:59:34 UTC (rev 36972)
+++ branches/soc-2010-jwilkins/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-05-28 10:01:00 UTC (rev 36973)
@@ -540,6 +540,12 @@
row.prop(brush, "auto_smooth_factor", slider=True)
row.prop(brush, "use_inverse_smooth_pressure", toggle=True, text="")
+ if brush.sculpt_tool not in ('GRAVITY'):
+ col.separator()
+
+ row = col.row(align=True)
+ row.prop(brush, "gravity_factor", slider=True)
+
if brush.sculpt_tool in {'GRAB', 'SNAKE_HOOK'}:
col.separator()
@@ -553,10 +559,10 @@
row.prop(brush, "crease_pinch_factor", slider=True, text="Pinch")
if brush.sculpt_tool not in {'PINCH', 'INFLATE', 'SMOOTH'}:
+ col.separator()
+
row = col.row(align=True)
- col.separator()
-
if brush.use_original_normal:
row.prop(brush, "use_original_normal", toggle=True, text="", icon='LOCKED')
else:
@@ -564,8 +570,10 @@
row.prop(brush, "sculpt_plane", text="")
- #if brush.sculpt_tool in {'CLAY', 'CLAY_TUBES', 'FLATTEN', 'FILL', 'SCRAPE'}:
- if brush.sculpt_tool in {'CLAY', 'FLATTEN', 'FILL', 'SCRAPE'}:
+ row = col.row()
+ row.prop(brush, "sculpt_plane_range")
+
+ if brush.sculpt_tool in {'CLAY', 'CLAY_STRIPS', 'FLATTEN', 'FILL', 'SCRAPE'}:
row = col.row(align=True)
row.prop(brush, "plane_offset", slider=True)
row.prop(brush, "use_offset_pressure", text="")
@@ -585,19 +593,30 @@
col.separator()
row = col.row()
- row.prop(brush, "use_frontface", text="Front Faces Only")
+ row.prop(brush, "use_frontface", text="Front-Faces Only")
+ row= col.row()
+ row.active = brush.use_frontface
+ row.prop(brush, "frontface_angle", text="Angle")
col.separator()
col.row().prop(brush, "direction", expand=True)
- if brush.sculpt_tool in {'DRAW', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY'}:
+ if brush.sculpt_tool in ('DRAW', 'GRAVITY', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY', 'CLAY_STRIP'):
col.separator()
col.prop(brush, "use_accumulate")
- if brush.sculpt_tool == 'LAYER':
+ if brush.sculpt_tool not in ('LAYER', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
col.separator()
+ col.prop(brush, "use_layer")
+
+ if brush.sculpt_tool in ('LAYER'):
+ col.separator()
+
+ if brush.sculpt_tool not in ('GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
+ col.prop(brush, "layer_distance")
+
ob = context.sculpt_object
do_persistent = True
@@ -709,44 +728,23 @@
col.separator()
col = layout.column()
- col.active = tex_slot.map_mode in {'FIXED'}
+ col.active = tex_slot.map_mode in ('FIXED', 'TILED', 'WRAP')
col.label(text="Angle:")
col = layout.column()
- if not brush.use_anchor and brush.sculpt_tool not in {'GRAB', 'SNAKE_HOOK', 'THUMB', 'ROTATE'} and tex_slot.map_mode in {'FIXED'}:
- col.prop(brush, "texture_angle_source_random", text="")
- else:
- col.prop(brush, "texture_angle_source_no_random", text="")
+ col.prop(brush, "texture_angle_source_random", text="")
- #row = col.row(align=True)
- #row.label(text="Angle:")
- #row.active = tex_slot.map_mode in {'FIXED', 'TILED'}
-
- #row = col.row(align=True)
-
- #col = row.column()
- #col.active = tex_slot.map_mode in {'FIXED'}
- #col.prop(brush, "use_rake", toggle=True, icon='PARTICLEMODE', text="")
-
col = layout.column()
col.prop(tex_slot, "angle", text="")
- col.active = tex_slot.map_mode in {'FIXED', 'TILED'}
+ col.active = tex_slot.map_mode in ('FIXED', 'TILED', 'WRAP')
- #col = layout.column()
- #col.prop(brush, "use_random_rotation")
- #col.active = (not brush.use_rake) and (not brush.use_anchor) and (brush.sculpt_tool not in {'GRAB', 'SNAKE_HOOK', 'THUMB', 'ROTATE'}) and tex_slot.map_mode in {'FIXED'}
-
- split = layout.split()
-
- col = split.column()
+ col = layout.column()
col.prop(tex_slot, "offset")
- col = split.column()
-
+ col = layout.column()
col.prop(tex_slot, "scale")
col = layout.column()
-
row = col.row(align=True)
row.label(text="Sample Bias:")
row = col.row(align=True)
@@ -754,7 +752,7 @@
row = col.row(align=True)
row.label(text="Overlay:")
- row.active = tex_slot.map_mode in {'FIXED', 'TILED'}
+ row.active = tex_slot.map_mode in ('FIXED', 'TILED', 'WRAP')
row = col.row(align=True)
@@ -765,11 +763,11 @@
else:
col.prop(brush, "use_texture_overlay", toggle=True, text="", icon='MUTE_IPO_ON')
- col.active = tex_slot.map_mode in {'FIXED', 'TILED'}
+ col.active = tex_slot.map_mode in ('FIXED', 'TILED', 'WRAP')
col = row.column()
col.prop(brush, "texture_overlay_alpha", text="Alpha")
- col.active = tex_slot.map_mode in {'FIXED', 'TILED'} and brush.use_texture_overlay
+ col.active = tex_slot.map_mode in ('FIXED', 'TILED', 'WRAP') and brush.use_texture_overlay
class VIEW3D_PT_tools_brush_tool(PaintPanel, bpy.types.Panel):
@@ -846,6 +844,9 @@
row = col.row()
row.active = brush.use_space
row.prop(brush, "spacing", text="Spacing")
+ row = col.row()
+ row.active = brush.use_space
+ row.prop(brush, "use_adaptive_space", text="Adaptive Spacing")
if (brush.sculpt_tool not in {'GRAB', 'THUMB', 'SNAKE_HOOK', 'ROTATE'}) and (not brush.use_anchor) and (not brush.use_restore_mesh):
col = layout.column()
@@ -954,9 +955,13 @@
layout.prop(sculpt, "use_threaded", text="Threaded Sculpt")
layout.prop(sculpt, "show_low_resolution")
+ layout.prop(sculpt, "use_deform_only")
layout.prop(sculpt, "show_brush")
- layout.prop(sculpt, "use_deform_only")
+ row = layout.row()
+ row.active = sculpt.show_brush and sculpt.is_on_surface_brush_capable()
+ row.prop(sculpt, "show_brush_on_surface")
+
layout.label(text="Unified Settings:")
layout.prop(tool_settings, "sculpt_paint_use_unified_size", text="Size")
layout.prop(tool_settings, "sculpt_paint_use_unified_strength", text="Strength")
@@ -988,9 +993,8 @@
layout.separator()
- layout.prop(sculpt, "use_symmetry_feather", text="Feather")
+ layout.prop(brush, "use_symmetry_feather", text="Feather")
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list