[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44191] branches/bmesh/blender: svn merge ^/trunk/blender -r44136:44189
Campbell Barton
ideasman42 at gmail.com
Fri Feb 17 16:51:50 CET 2012
Revision: 44191
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44191
Author: campbellbarton
Date: 2012-02-17 15:51:48 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r44136:44189
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44136
Modified Paths:
--------------
branches/bmesh/blender/build_files/scons/config/darwin-config.py
branches/bmesh/blender/intern/tools/credits_svn_gen.py
branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h
branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c
branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_draw.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/makesdna/DNA_movieclip_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_tracking_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_movieclip.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872
/trunk/blender:39992-44136
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152
/trunk/blender:39992-44189
Modified: branches/bmesh/blender/build_files/scons/config/darwin-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/darwin-config.py 2012-02-17 15:39:32 UTC (rev 44190)
+++ branches/bmesh/blender/build_files/scons/config/darwin-config.py 2012-02-17 15:51:48 UTC (rev 44191)
@@ -86,6 +86,9 @@
LIBDIR = '${LCGDIR}'
+if XCODE_CUR_VER >= '4.3': ## since version 4.3, XCode and developer dir are bundled ##
+ MACOSX_SDK = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
+
#############################################################################
################### Dependency settings ##################
#############################################################################
Modified: branches/bmesh/blender/intern/tools/credits_svn_gen.py
===================================================================
--- branches/bmesh/blender/intern/tools/credits_svn_gen.py 2012-02-17 15:39:32 UTC (rev 44190)
+++ branches/bmesh/blender/intern/tools/credits_svn_gen.py 2012-02-17 15:51:48 UTC (rev 44191)
@@ -163,6 +163,7 @@
"dfelinto": "Dalai Felinto",
"dingto": "Thomas Dinges",
"djcapelis": "D.J. Capelis",
+ "domino": "Domino Marama",
"dougal2": "Doug Hammond",
"eeshlo": "Alfredo de Greef",
"elubie": "Andrea Weikert",
@@ -232,10 +233,11 @@
"schlaile": "Peter Schlaile",
"scourage": "Robert Holcomb",
"sgefant": "Stefan Gartner",
- "sirdude": "sirdude",
+ "sirdude": "Kent Mein",
"smerch": "Alex Sytnik",
"snailrose": "Charlie Carley",
"stiv": "Stephen Swaney",
+ "trumanblending": "Andrew Hale",
"theeth": "Martin Poirier",
"themyers": "Ricki Myers",
"ton": "Ton Roosendaal",
@@ -248,7 +250,11 @@
"zuster": "Daniel Dunbar",
"jason_hays22": "Jason Hays",
"miikah": "Miika Hamalainen",
-
+ "howardt": "Howard Trickey",
+ "kanttori": "Juha Mäki-Kanto",
+ "xglasyliax": "Peter Larabell",
+ "lockal": "Sv. Lockal",
+ "kupoman": "Daniel Stokes",
# TODO, find remaining names
"nlin": "",
}
@@ -275,7 +281,10 @@
"""
patches = {}
import csv
- tracker = csv.reader(open(filepath, 'r', encoding='utf-8'), delimiter=';', quotechar='|')
+ tracker = csv.reader(open(filepath, 'r', encoding='utf-8'),
+ delimiter=';',
+ quotechar='|')
+
for i, row in enumerate(tracker):
if i == 0:
id_index = row.index("artifact_id")
@@ -396,7 +405,14 @@
if patch_author is None:
# will error out if we miss adding new devs
- credit = credits[commit.author]
+ credit = credits.get(commit.author)
+ if credit is None:
+ print("warning: '%s' is not in 'author_name_mapping' !" %
+ commit.author)
+
+ # will be discarded
+ credit = Credit()
+
else:
# so we dont use again
del patch_map[patch_id]
@@ -432,7 +448,12 @@
if not credit.commits:
continue
- author_real = author_name_mapping[author]
+ author_real = author_name_mapping.get(author)
+
+ if author_real is None:
+ print("warning: '%s' is not in 'author_name_mapping' dict!")
+ author_real = author
+
if author_real == author:
name_string = "<b>%s</b>" % author
else:
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43918,43935-44136
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43918,43935-44189
Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py 2012-02-17 15:39:32 UTC (rev 44190)
+++ branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py 2012-02-17 15:51:48 UTC (rev 44191)
@@ -97,7 +97,7 @@
# image path has been checked so the path could not be read for some
# reason, so be sure to return a placeholder
- if place_holder:
+ if place_holder and image is None:
image = _image_load_placeholder(path)
return image
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-02-17 15:39:32 UTC (rev 44190)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-02-17 15:51:48 UTC (rev 44191)
@@ -684,7 +684,9 @@
row.active = stab.rotation_track is not None
row.prop(stab, "influence_rotation")
+ layout.prop(stab, "filter_type")
+
class CLIP_PT_marker(Panel):
bl_space_type = 'CLIP_EDITOR'
bl_region_type = 'UI'
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-02-17 15:39:32 UTC (rev 44190)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-02-17 15:51:48 UTC (rev 44191)
@@ -19,6 +19,7 @@
# <pep8 compliant>
import bpy
from bpy.types import Header, Menu, Panel
+from .properties_paint_common import UnifiedPaintPanel
class VIEW3D_HT_header(Header):
@@ -51,6 +52,8 @@
elif obj:
if mode_string not in {'PAINT_TEXTURE'}:
sub.menu("VIEW3D_MT_%s" % mode_string.lower())
+ if mode_string in {'SCULPT', 'PAINT_VERTEX', 'PAINT_WEIGHT', 'PAINT_TEXTURE'}:
+ sub.menu("VIEW3D_MT_brush")
else:
sub.menu("VIEW3D_MT_object")
@@ -80,22 +83,23 @@
row.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
# Snap
- snap_element = toolsettings.snap_element
- row = layout.row(align=True)
- row.prop(toolsettings, "use_snap", text="")
- row.prop(toolsettings, "snap_element", text="", icon_only=True)
- if snap_element != 'INCREMENT':
- row.prop(toolsettings, "snap_target", text="")
- if obj:
- if obj.mode == 'OBJECT':
- row.prop(toolsettings, "use_snap_align_rotation", text="")
- elif obj.mode == 'EDIT':
- row.prop(toolsettings, "use_snap_self", text="")
+ if not obj or obj.mode not in {'SCULPT', 'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT', 'PARTICLE_EDIT'}:
+ snap_element = toolsettings.snap_element
+ row = layout.row(align=True)
+ row.prop(toolsettings, "use_snap", text="")
+ row.prop(toolsettings, "snap_element", text="", icon_only=True)
+ if snap_element != 'INCREMENT':
+ row.prop(toolsettings, "snap_target", text="")
+ if obj:
+ if obj.mode == 'OBJECT':
+ row.prop(toolsettings, "use_snap_align_rotation", text="")
+ elif obj.mode == 'EDIT':
+ row.prop(toolsettings, "use_snap_self", text="")
- if snap_element == 'VOLUME':
- row.prop(toolsettings, "use_snap_peel_object", text="")
- elif snap_element == 'FACE':
- row.prop(toolsettings, "use_snap_project", text="")
+ if snap_element == 'VOLUME':
+ row.prop(toolsettings, "use_snap_peel_object", text="")
+ elif snap_element == 'FACE':
+ row.prop(toolsettings, "use_snap_project", text="")
# OpenGL render
row = layout.row(align=True)
@@ -1012,7 +1016,46 @@
layout.operator("object.game_property_clear")
+
+# ********** Brush menu **********
+class VIEW3D_MT_brush(Menu):
+ bl_label = "Brush"
+ def draw(self, context):
+ layout = self.layout
+
+ settings = UnifiedPaintPanel.paint_settings(context)
+ brush = settings.brush
+
+ ups = context.tool_settings.unified_paint_settings
+ layout.prop(ups, "use_unified_size", text="Unified Size")
+ layout.prop(ups, "use_unified_strength", text="Unified Strength")
+
+ # skip if no active brush
+ if not brush:
+ return
+
+ # TODO: still missing a lot of brush options here
+
+ # sculpt options
+ if context.sculpt_object:
+
+ sculpt_tool = brush.sculpt_tool
+
+ layout.separator()
+ layout.operator_menu_enum("brush.curve_preset", "shape", text='Curve Preset')
+ layout.separator()
+
+ if sculpt_tool != 'GRAB':
+ layout.prop_menu_enum(brush, "stroke_method")
+
+ if sculpt_tool in {'DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'}:
+ layout.prop_menu_enum(brush, "direction")
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list