Revision: 30511 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30511 Author: nicholasbishop Date: 2010-07-19 22:52:33 +0200 (Mon, 19 Jul 2010)
Log Message: ----------- svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30324:30325 Nasty merge conflicts in editors/sculpt_paint, probably made some mistakes. Will finish merging to latest trunk before fixing bugs though. Modified Paths: -------------- branches/soc-2010-nicolasbishop/intern/ghost/SConscript branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCarbon.cpp branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowWin32.cpp branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_blender.h branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_brush.h branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_paint.h branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/brush.c branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/colortools.c branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/icons.c branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/image.c branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/subsurf_ccg.c branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_pbvh.h branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_geom.c branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/pbvh.c branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/gpencil_buttons.c branches/soc-2010-nicolasbishop/source/blender/editors/include/UI_interface.h branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_icons.c branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_templates.c branches/soc-2010-nicolasbishop/source/blender/editors/interface/resources.c branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/SConscript branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_image.c branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_intern.h branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_mask.c branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_ops.c branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_utils.c branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/sculpt.c branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/sculpt_intern.h branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_buttons.c branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_window.c branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_buttons.c branches/soc-2010-nicolasbishop/source/blender/editors/space_node/drawnode.c branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_draw.c branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_ID.h branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_brush_types.h branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_color_types.h branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_scene_types.h branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_userdef_types.h branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_windowmanager_types.h branches/soc-2010-nicolasbishop/source/blender/makesrna/SConscript branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/CMakeLists.txt branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_brush.c branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_image.c branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sculpt_paint.c branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ui_api.c branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_userdef.c branches/soc-2010-nicolasbishop/source/blender/windowmanager/SConscript branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_draw.c branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/stubs.c Added Paths: ----------- branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/sculpt_undo.c Modified: branches/soc-2010-nicolasbishop/intern/ghost/SConscript =================================================================== --- branches/soc-2010-nicolasbishop/intern/ghost/SConscript 2010-07-19 20:01:18 UTC (rev 30510) +++ branches/soc-2010-nicolasbishop/intern/ghost/SConscript 2010-07-19 20:52:33 UTC (rev 30511) @@ -56,9 +56,8 @@ if env['BF_GHOST_DEBUG']: defs.append('BF_GHOST_DEBUG') - + 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 env.BlenderLib ('bf_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) - Modified: branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCarbon.cpp =================================================================== --- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCarbon.cpp 2010-07-19 20:01:18 UTC (rev 30510) +++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCarbon.cpp 2010-07-19 20:52:33 UTC (rev 30511) @@ -42,7 +42,7 @@ const GHOST_TInt32 GHOST_WindowCarbon::s_sizeRectSize = 16; #endif //GHOST_DRAW_CARBON_GUTTER -static const GLint sPreferredFormatWindow[8] = { +static const GLint sPreferredFormatWindow[10] = { AGL_RGBA, AGL_DOUBLEBUFFER, AGL_ACCELERATED, @@ -50,7 +50,7 @@ AGL_NONE, }; -static const GLint sPreferredFormatFullScreen[9] = { +static const GLint sPreferredFormatFullScreen[11] = { AGL_RGBA, AGL_DOUBLEBUFFER, AGL_ACCELERATED, Modified: branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm =================================================================== --- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-07-19 20:01:18 UTC (rev 30510) +++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-07-19 20:52:33 UTC (rev 30511) @@ -348,10 +348,11 @@ pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated; //pixelFormatAttrsWindow[i++] = NSOpenGLPFAAllowOfflineRenderers,; // Removed to allow 10.4 builds, and 2 GPUs rendering is not used anyway - + pixelFormatAttrsWindow[i++] = NSOpenGLPFADepthSize; pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 32; + if (stereoVisual) pixelFormatAttrsWindow[i++] = NSOpenGLPFAStereo; if (numOfAASamples>0) { Modified: branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowWin32.cpp =================================================================== --- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowWin32.cpp 2010-07-19 20:01:18 UTC (rev 30510) +++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowWin32.cpp 2010-07-19 20:52:33 UTC (rev 30511) @@ -1093,7 +1093,7 @@ !(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)) return 0; weight = 1; /* it's usable */ Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py =================================================================== --- branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py 2010-07-19 20:01:18 UTC (rev 30510) +++ branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py 2010-07-19 20:52:33 UTC (rev 30511) @@ -437,6 +437,7 @@ col.prop(md, "levels", text="Preview") col.prop(md, "sculpt_levels", text="Sculpt") col.prop(md, "render_levels", text="Render") + col.prop(bpy.context.tool_settings.sculpt, "fast_navigate") if wide_ui: col = split.column() Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py =================================================================== --- branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py 2010-07-19 20:01:18 UTC (rev 30510) +++ branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py 2010-07-19 20:52:33 UTC (rev 30511) @@ -276,15 +276,12 @@ if type(idblock) == bpy.types.Brush: if context.sculpt_object: + layout.label(text="Brush Mapping:") layout.prop(tex, "map_mode", expand=True) row = layout.row() row.active = tex.map_mode in ('FIXED', 'TILED') row.prop(tex, "angle") - - row = layout.row() - row.active = tex.map_mode in ('TILED', '3D') - row.column().prop(tex, "size") else: if type(idblock) == bpy.types.Material: split = layout.split(percentage=0.3) @@ -308,15 +305,17 @@ row.prop(tex, "y_mapping", text="") row.prop(tex, "z_mapping", text="") - # any non brush - split = layout.split() + split = layout.split() + col = split.column() + col.prop(tex, "offset") + + if wide_ui: col = split.column() - col.prop(tex, "offset") + else: + col.separator() - if wide_ui: - col = split.column() - col.prop(tex, "size") + col.prop(tex, "size") class TEXTURE_PT_influence(TextureSlotPanel): Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py =================================================================== --- branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py 2010-07-19 20:01:18 UTC (rev 30510) +++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py 2010-07-19 20:52:33 UTC (rev 30511) @@ -327,7 +327,21 @@ row.separator() row.separator() + sculpt = context.tool_settings.sculpt col = row.column() + col.label(text="Paint and Sculpt:") + col.prop(edit, "sculpt_paint_use_unified_size", text="Unify Size") + col.prop(edit, "sculpt_paint_use_unified_strength", text="Unify Strength") + row = col.row(align=True) + row.label("Overlay Color:") + row.prop(edit, "sculpt_paint_overlay_col", text="") + col.prop(sculpt, "use_openmp", text="Threaded Sculpt") + col.prop(sculpt, "show_brush") + + col.separator() + col.separator() + col.separator() + col.label(text="Duplicate Data:") col.prop(edit, "duplicate_mesh", text="Mesh") col.prop(edit, "duplicate_surface", text="Surface") Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py =================================================================== --- branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py 2010-07-19 20:01:18 UTC (rev 30510) +++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py 2010-07-19 20:52:33 UTC (rev 30511) @@ -19,6 +19,7 @@ # <pep8 compliant> import bpy +narrowui = bpy.context.user_preferences.view.properties_width_check class View3DPanel(bpy.types.Panel): bl_space_type = 'VIEW_3D' @@ -536,18 +537,26 @@ if not context.particle_edit_object: col = layout.split().column() - row = col.row() - if context.sculpt_object and brush: - defaultbrushes = 8 - elif context.texture_paint_object and brush: - defaultbrushes = 4 + if context.sculpt_object and context.tool_settings.sculpt: + col.template_ID_preview(settings, "brush", new="brush.add", filter="is_sculpt_brush", rows=3, cols=8) + elif context.texture_paint_object and context.tool_settings.image_paint: + col.template_ID_preview(settings, "brush", new="brush.add", filter="is_imapaint_brush", rows=3, cols=8) + elif context.vertex_paint_object and context.tool_settings.vertex_paint: + col.template_ID_preview(settings, "brush", new="brush.add", filter="is_vpaint_brush", rows=3, cols=8) + elif context.weight_paint_object and context.tool_settings.weight_paint: + col.template_ID_preview(settings, "brush", new="brush.add", filter="is_wpaint_brush", rows=3, cols=8) else: - defaultbrushes = 7 + row = col.row() - row.template_list(settings, "brushes", settings, "active_brush_index", rows=2, maxrows=defaultbrushes) + if context.sculpt_object and brush: + defaultbrushes = 8 + elif context.texture_paint_object and brush: + defaultbrushes = 4 + else: + defaultbrushes = 7 - col.template_ID(settings, "brush", new="brush.add") + row.template_list(settings, "brushes", settings, "active_brush_index", rows=2, maxrows=defaultbrushes) # Particle Mode # @@ -579,45 +588,153 @@ # Sculpt Mode # elif context.sculpt_object and brush: + edit = context.user_preferences.edit + col = layout.column() + + col.separator() row = col.row(align=True) - row.prop(brush, "size", slider=True) - if brush.sculpt_tool != 'GRAB': - row.prop(brush, "use_size_pressure", toggle=True, text="") + if edit.sculpt_paint_use_unified_size: + if edit.sculpt_paint_unified_lock_brush_size: + row.prop(edit, "sculpt_paint_unified_lock_brush_size", toggle=True, text="", icon='LOCKED') + row.prop(edit, "sculpt_paint_unified_unprojected_radius", text="Unified Radius", slider=True) + else: + row.prop(edit, "sculpt_paint_unified_lock_brush_size", toggle=True, text="", icon='UNLOCKED') + row.prop(edit, "sculpt_paint_unified_size", text="Unified Radius", slider=True) + else: + if brush.lock_brush_size: + row.prop(brush, "lock_brush_size", toggle=True, text="", icon='LOCKED') + row.prop(brush, "unprojected_radius", text="Radius", slider=True) + else: + row.prop(brush, "lock_brush_size", toggle=True, text="", icon='UNLOCKED') + row.prop(brush, "size", text="Radius", slider=True) + @@ 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