diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
commit | 65668dc5eb45ae6e90675aecc9dd6132dc7f0b5e (patch) | |
tree | 355f3b4dd6f28dc0debf249d1c85a6474784dcfe /release | |
parent | 16702c172939a399ddd0e61fc14a8b0944c4249b (diff) | |
parent | 15bd96efeb77cf33215613a53059f01db7242b31 (diff) |
Merged changes in the trunk up to revision 41368.
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
Diffstat (limited to 'release')
20 files changed, 24 insertions, 37 deletions
diff --git a/release/datafiles/LICENSE-bfont.ttf.txt b/release/datafiles/LICENSE-bfont.ttf.txt index 754089661b0..4aa22365c83 100644 --- a/release/datafiles/LICENSE-bfont.ttf.txt +++ b/release/datafiles/LICENSE-bfont.ttf.txt @@ -98,4 +98,3 @@ dealings in this Font Software without prior written authorization from Tavmjong Bah. For further information, contact: tavmjong @ free . fr. -$Id$ diff --git a/release/datafiles/blenderbuttons b/release/datafiles/blenderbuttons Binary files differdeleted file mode 100644 index a68a1f8394c..00000000000 --- a/release/datafiles/blenderbuttons +++ /dev/null diff --git a/release/plugins/Makefile b/release/plugins/Makefile index ee7086b331d..353e559e622 100644 --- a/release/plugins/Makefile +++ b/release/plugins/Makefile @@ -1,6 +1,3 @@ -# -# $Id$ -# # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/release/plugins/bmake b/release/plugins/bmake index 9740bfa716a..e2f9e9cc596 100644 --- a/release/plugins/bmake +++ b/release/plugins/bmake @@ -1,7 +1,5 @@ #!/bin/sh # -# $Id$ -# # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/release/plugins/sequence/Makefile b/release/plugins/sequence/Makefile index ab847adf5fe..2b12e62d24a 100644 --- a/release/plugins/sequence/Makefile +++ b/release/plugins/sequence/Makefile @@ -1,6 +1,3 @@ -# -# $Id$ -# # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/release/plugins/sequence/blur.c b/release/plugins/sequence/blur.c index cec3351e976..e95c243b558 100644 --- a/release/plugins/sequence/blur.c +++ b/release/plugins/sequence/blur.c @@ -1,5 +1,4 @@ /** - * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/release/plugins/sequence/scatter.c b/release/plugins/sequence/scatter.c index 4741b33ce0e..73e97e165ca 100644 --- a/release/plugins/sequence/scatter.c +++ b/release/plugins/sequence/scatter.c @@ -1,5 +1,4 @@ /** - * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/release/plugins/texture/Makefile b/release/plugins/texture/Makefile index ab847adf5fe..2b12e62d24a 100644 --- a/release/plugins/texture/Makefile +++ b/release/plugins/texture/Makefile @@ -1,6 +1,3 @@ -# -# $Id$ -# # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/release/plugins/texture/clouds2.c b/release/plugins/texture/clouds2.c index d38913951c3..454e8e28206 100644 --- a/release/plugins/texture/clouds2.c +++ b/release/plugins/texture/clouds2.c @@ -1,5 +1,4 @@ /** - * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/release/plugins/texture/tiles.c b/release/plugins/texture/tiles.c index 3b533d456b4..c7af6e58fa4 100644 --- a/release/plugins/texture/tiles.c +++ b/release/plugins/texture/tiles.c @@ -1,5 +1,4 @@ /** - * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py index d0778ddafb2..790c22d57d0 100644 --- a/release/scripts/startup/bl_operators/image.py +++ b/release/scripts/startup/bl_operators/image.py @@ -145,7 +145,11 @@ class ProjectEdit(Operator): for image in bpy.data.images: image.tag = True - if 'FINISHED' not in bpy.ops.paint.image_from_view(): + # opengl buffer may fail, we can't help this, but best report it. + try: + ret = bpy.ops.paint.image_from_view() + except RuntimeError as err: + self.report({'ERROR'}, str(err)) return {'CANCELLED'} image_new = None diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index 1248fc24ed7..66d0d72efc1 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -1105,8 +1105,8 @@ from bpy.props import FloatProperty class SmartProject(Operator): - '''This script projection unwraps the selected faces of a mesh. ''' \ - '''it operates on all selected mesh objects, and can be used unwrap selected faces, or all faces''' + '''This script projection unwraps the selected faces of a mesh ''' \ + '''(it operates on all selected mesh objects, and can be used to unwrap selected faces, or all faces)''' bl_idname = "uv.smart_project" bl_label = "Smart UV Project" bl_options = {'REGISTER', 'UNDO'} diff --git a/release/scripts/startup/bl_operators/vertexpaint_dirt.py b/release/scripts/startup/bl_operators/vertexpaint_dirt.py index 5fb5c7f39cf..ea58864f7c2 100644 --- a/release/scripts/startup/bl_operators/vertexpaint_dirt.py +++ b/release/scripts/startup/bl_operators/vertexpaint_dirt.py @@ -159,7 +159,7 @@ class VertexPaintDirt(Operator): ) blur_iterations = IntProperty( name="Blur Iterations", - description="Number times to blur the colors (higher blurs more)", + description="Number of times to blur the colors (higher blurs more)", min=0, max=40, default=1, ) diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index a539e2693c1..0c9f1c33abb 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1451,7 +1451,7 @@ class WM_OT_operator_cheat_sheet(Operator): class WM_OT_addon_enable(Operator): "Enable an addon" bl_idname = "wm.addon_enable" - bl_label = "Enable Add-On" + bl_label = "Enable Addon" module = StringProperty( name="Module", @@ -1482,7 +1482,7 @@ class WM_OT_addon_enable(Operator): class WM_OT_addon_disable(Operator): "Disable an addon" bl_idname = "wm.addon_disable" - bl_label = "Disable Add-On" + bl_label = "Disable Addon" module = StringProperty( name="Module", @@ -1499,7 +1499,7 @@ class WM_OT_addon_disable(Operator): class WM_OT_addon_install(Operator): "Install an addon" bl_idname = "wm.addon_install" - bl_label = "Install Add-On..." + bl_label = "Install Addon..." overwrite = BoolProperty( name="Overwrite", @@ -1667,7 +1667,7 @@ class WM_OT_addon_install(Operator): class WM_OT_addon_remove(Operator): "Disable an addon" bl_idname = "wm.addon_remove" - bl_label = "Remove Add-On" + bl_label = "Remove Addon" module = StringProperty( name="Module", @@ -1722,7 +1722,7 @@ class WM_OT_addon_remove(Operator): class WM_OT_addon_expand(Operator): - "Display more information on this add-on" + "Display more information on this addon" bl_idname = "wm.addon_expand" bl_label = "" diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index 2e54631afa3..682341cbf2f 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -110,7 +110,7 @@ def register(): WindowManager.addon_filter = EnumProperty( items=addon_filter_items, name="Category", - description="Filter add-ons by category", + description="Filter addons by category", ) WindowManager.addon_support = EnumProperty( diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 0e7fccae8df..c6d96171c38 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -145,7 +145,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): #row.label(text="Render") if part.is_fluid: - layout.label(text=str(part.count) + " fluid particles for this frame") + layout.label(text="{} fluid particles for this frame".format(str(part.count))) return row = col.row() @@ -504,7 +504,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): col.label(text="Fluid properties:") col.prop(fluid, "stiffness", text="Stiffness") col.prop(fluid, "linear_viscosity", text="Viscosity") - col.prop(fluid, "buoyancy", text="Buoancy", slider=True) + col.prop(fluid, "buoyancy", text="Buoyancy", slider=True) col = split.column() col.label(text="Advanced:") @@ -1162,7 +1162,7 @@ class PARTICLE_PT_force_fields(ParticleButtonsPanel, Panel): class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel): - bl_label = "Vertexgroups" + bl_label = "Vertex Groups" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER'} diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index c25b42e298e..efb760c0b43 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -206,7 +206,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel): col = split.column() if scene.use_gravity: - col.label(text="Using Scene Gravity", icon="SCENE_DATA") + col.label(text="Use Scene Gravity", icon="SCENE_DATA") sub = col.column() sub.enabled = False sub.prop(fluid, "gravity", text="") @@ -215,7 +215,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel): col.prop(fluid, "gravity", text="") if scene.unit_settings.system != 'NONE': - col.label(text="Using Scene Size Units", icon="SCENE_DATA") + col.label(text="Use Scene Size Units", icon="SCENE_DATA") sub = col.column() sub.enabled = False sub.prop(fluid, "simulation_scale", text="Metres") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 96a08e57157..c6c4a8f3335 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -762,7 +762,7 @@ class USERPREF_MT_ndof_settings(Menu): layout.prop(input_prefs, "ndof_show_guide") layout.separator() - layout.label(text="orbit options") + layout.label(text="Orbit options") if input_prefs.view_rotate_method == 'TRACKBALL': layout.prop(input_prefs, "ndof_roll_invert_axis") layout.prop(input_prefs, "ndof_tilt_invert_axis") @@ -771,13 +771,13 @@ class USERPREF_MT_ndof_settings(Menu): layout.prop(input_prefs, "ndof_orbit_invert_axes") layout.separator() - layout.label(text="pan options") + layout.label(text="Pan options") layout.prop(input_prefs, "ndof_panx_invert_axis") layout.prop(input_prefs, "ndof_pany_invert_axis") layout.prop(input_prefs, "ndof_panz_invert_axis") layout.separator() - layout.label(text="fly options") + layout.label(text="Fly options") layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY') layout.prop(input_prefs, "ndof_lock_horizon", icon='NDOF_DOM') @@ -966,7 +966,7 @@ class USERPREF_PT_addons(Panel): if info["support"] not in support: continue - # check if add-on should be visible with current filters + # check if addon should be visible with current filters if (filter == "All") or \ (filter == info["category"]) or \ (filter == "Enabled" and is_enabled) or \ diff --git a/release/text/readme.html b/release/text/readme.html index e0bef8a50e1..8c5ead49036 100644 --- a/release/text/readme.html +++ b/release/text/readme.html @@ -36,7 +36,7 @@ <p class="body"><b>Linux, FreeBSD, Solaris: </b>Unpack the archive, Then run the Blender executable.</p> <p class="body"><b>Mac OS X: </b>The downloaded package includes blender.app. Optionally copy this to your Applications folder, and add it to the dock by dragging it from there to the dock.</p> <p></p> -<p class="body"><b>Installing Add-ons (all systems)</b> Add-ons can be installed from the user preferences addons section, download an addon as a .py or .zip file, then press the "Install Add-on" button and select the file to install it.</p> +<p class="body"><b>Installing Addons (all systems)</b> Addons can be installed from the user preferences addons section, download an addon as a .py or .zip file, then press the "Install Addon" button and select the file to install it.</p> <p><br></p> <p class="header"><b>Getting Started</b></p> <p class="body">When opening Blender, you’ll see large 3D view in the center, a Toolbar on the left, a Properties area and an Outliner area on the right and a Timeline at the bottom.</p> diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi index eddd215c64d..eb9b6629108 100644 --- a/release/windows/installer/00.sconsblender.nsi +++ b/release/windows/installer/00.sconsblender.nsi @@ -1,5 +1,4 @@ ; -; $Id$ ; ; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net) ; |