Merge branch 'master' into soc-2013-paint

Conflicts:
	source/blender/blenkernel/BKE_blender.h
	source/blender/blenloader/intern/versioning_270.c

4 files changed, 16 insertions, 3 deletions

diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png
index b496bb77245..aa2b6348e79 100644
--- a/release/datafiles/splash.png
+++ b/release/datafiles/splash.png
diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png
index 654d07b093f..32ef1aa45eb 100644
--- a/release/datafiles/splash_2x.png
+++ b/release/datafiles/splash_2x.png
diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
index aa10b71783c..9371159e0e7 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -43,6 +43,7 @@ class SpellChecker():
         "fader",
         "globbing",
         "hasn",  # hasn't
+        "hetero",
         "hoc",  # ad-hoc
         "indices",
         "iridas",
@@ -52,6 +53,7 @@ class SpellChecker():
         "latin",
         "merchantability",
         "mplayer",
+        "pong",  # ping pong
         "teleport", "teleporting",
         "vertices",
 
@@ -89,8 +91,10 @@ class SpellChecker():
         "customdata",
         "dataset", "datasets",
         "de",
+        "deconstruct",
         "defocus",
         "denoise",
+        "deselect", "deselecting", "deselection",
         "despill", "despilling",
         "editcurve",
         "editmesh",
@@ -123,8 +127,8 @@ class SpellChecker():
         "multiuser",
         "namespace",
         "keyconfig",
+        "online",
         "playhead",
-        "polyline",
         "popup", "popups",
         "pre",
         "precache", "precaching",
@@ -223,6 +227,9 @@ class SpellChecker():
         "rasterized", "rasterization", "rasterizer",
         "renderer", "renderable", "renderability",
 
+        # Really bad!!!
+        "convertor",
+
         # Abbreviations
         "aero",
         "amb",
@@ -233,6 +240,7 @@ class SpellChecker():
         "const",
         "coord", "coords",
         "degr",
+        "diff",
         "dof",
         "dupli", "duplis",
         "eg",
@@ -279,6 +287,7 @@ class SpellChecker():
         "vel",  # velocity!
         "vert", "verts",
         "vis",
+        "xor",
         "xyz", "xzy", "yxz", "yzx", "zxy", "zyx",
         "xy", "xz", "yx", "yz", "zx", "zy",
 
@@ -290,6 +299,7 @@ class SpellChecker():
         "fribidi",
         "gettext",
         "hashable",
+        "hotspot",
         "intrinsics",
         "isosurface",
         "jitter", "jittering", "jittered",
@@ -302,8 +312,11 @@ class SpellChecker():
         "normals",
         "numpad",
         "octree",
+        "omnidirectional",
         "opengl",
         "openmp",
+        "photoreceptor",
+        "poly",
         "polyline", "polylines",
         "pulldown", "pulldowns",
         "quantized",
diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py
index 42c25025757..da10b17422e 100644
--- a/release/scripts/presets/keyconfig/maya.py
+++ b/release/scripts/presets/keyconfig/maya.py
@@ -1448,9 +1448,9 @@ kmi.properties.value = 8
 # Map Node Editor
 km = kc.keymaps.new('Node Editor', space_type='NODE_EDITOR', region_type='WINDOW', modal=False)
 
-kmi = km.keymap_items.new('node.select', 'SELECTMOUSE', 'CLICK')
+kmi = km.keymap_items.new('node.select', 'SELECTMOUSE', 'PRESS')
 kmi.properties.extend = False
-kmi = km.keymap_items.new('node.select', 'SELECTMOUSE', 'CLICK', shift=True)
+kmi = km.keymap_items.new('node.select', 'SELECTMOUSE', 'PRESS', shift=True)
 kmi.properties.extend = True
 kmi = km.keymap_items.new('node.select_border', 'EVT_TWEAK_S', 'ANY')
 kmi.properties.extend = False