diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
commit | 103ef7cacb5dd10aa2dfd5bb973c0dfd772885eb (patch) | |
tree | 8fd9a6b770998717f4555e7121fb16116b441865 /release | |
parent | eb21bdd249427465a093a078cda7864309a8f735 (diff) | |
parent | 869d654cccba8b9b0bc295e7ce89e8e322912023 (diff) |
Merged changes from trunk r58324-58419.ge_dev
Diffstat (limited to 'release')
-rw-r--r-- | release/datafiles/LICENSE-droidsans.ttf.txt | 3 | ||||
-rw-r--r-- | release/datafiles/fonts/droidsans.ttf.gz | bin | 2617436 -> 2644825 bytes | |||
-rw-r--r-- | release/datafiles/splash.png | bin | 94411 -> 177989 bytes | |||
-rw-r--r-- | release/scripts/startup/bl_operators/node.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 6 |
5 files changed, 12 insertions, 1 deletions
diff --git a/release/datafiles/LICENSE-droidsans.ttf.txt b/release/datafiles/LICENSE-droidsans.ttf.txt index 1f090edd309..ca0d6bbaea1 100644 --- a/release/datafiles/LICENSE-droidsans.ttf.txt +++ b/release/datafiles/LICENSE-droidsans.ttf.txt @@ -5,6 +5,7 @@ Blender Main I18n font ("droidsans.ttf") includes glyphs imported from the follo 3. Samyak-devanagari 4. Droid Sans Hebrew Regular 5. Droid Sans Ethiopic Regular +6. Samyak-tamil These were merged using FontForge in (approximately) the above order. For each glyph, a license of the font from which it was imported is applied. @@ -30,7 +31,7 @@ Copyright: License: Apache-2.0 See Appendix A. -(3) Samyak-devanagari +(3) Samyak-devanagari and (6) Samyak-tamil Copyright: 2005-2006, Rahul Bhalerao <b.rahul.pm@gmail.com> 2005-2006, Bageshri Salvi <sbageshri@gmail.com> 2005-2006, Pravin Satpute <pravin.d.s@gmail.com> diff --git a/release/datafiles/fonts/droidsans.ttf.gz b/release/datafiles/fonts/droidsans.ttf.gz Binary files differindex a0e7502cc1f..81683e6379f 100644 --- a/release/datafiles/fonts/droidsans.ttf.gz +++ b/release/datafiles/fonts/droidsans.ttf.gz diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png Binary files differindex 01d903c457b..3c05ba86cd3 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png diff --git a/release/scripts/startup/bl_operators/node.py b/release/scripts/startup/bl_operators/node.py index cc1fa93ec2c..c70b5832bfb 100644 --- a/release/scripts/startup/bl_operators/node.py +++ b/release/scripts/startup/bl_operators/node.py @@ -66,8 +66,12 @@ class NodeAddOperator(): # convert mouse position to the View2D for later node placement if context.region.type == 'WINDOW': + # XXX, temp fix for [#35920], still fails for (U.pixelsize != 1) + dpi_fac = context.user_preferences.system.dpi / 72.0 space.cursor_location = v2d.region_to_view(event.mouse_region_x, event.mouse_region_y) + space.cursor_location /= dpi_fac + else: space.cursor_location = tree.view_center diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 7fe8d334572..2bbfd26f5f3 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -723,6 +723,7 @@ class VIEW3D_MT_select_edit_lattice(Menu): layout.separator() + layout.operator("lattice.select_random") layout.operator("lattice.select_all").action = 'TOGGLE' layout.operator("lattice.select_all", text="Inverse").action = 'INVERT' @@ -747,6 +748,11 @@ class VIEW3D_MT_select_edit_armature(Menu): layout.separator() + layout.operator("armature.select_more", text="More") + layout.operator("armature.select_less", text="Less") + + layout.separator() + layout.operator("armature.select_hierarchy", text="Parent").direction = 'PARENT' layout.operator("armature.select_hierarchy", text="Child").direction = 'CHILD' |