Merge branch 'master' into idea147

* master: (5734 commits)
  svn update
  update addon scripts
  Get rid of c++ in blenkernel and modifiers Also use guarded allocations for navmesh stuff.
  Internationalization: fix OS X scons install to copy font and language files correctly.
  SVN maintenance.
  git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@40401 954f8c5b-7b00-dc11-b283-0030488c597c
  have blf.gettext even when internationalization is disabled (just passes through).
  Fix for BLI_ungzip_to_mem: it'll return NULL now if file is not found.
  Ignore .Blanguages and .bfont.ttf when installing. This files aren't used by blender anymore but they leads to portable install when using scons.
  We are now in Bcon 3 - Beta.
  - Fix for compiling without international support - Enable international support for win64 msvc by default
  Improved Internationalization and Localization ==============================================
  fix [#28672] Blender segfault after exiting a game that was opened with autoplay on (Blender, not blenderplayer)
  committed change to transforms THRESHOLD by accident, also update convenience makefile to regenerate real makefiles before static checking.
  tag & comment unused vars with /* UNUSED */
  Minor: Other UI strings typos and tweaks.
  Don't set BF_NUMJOBS in default config, but instead let users do that in user-config.py.
  fix from Juha Mäki-Kanto (kanttori), was calculating connectivity data when proportional editmode was enabled, even if connectivity setting was off.
  changes for materials to treat them as shorts not int/chars (since they are stored as shorts intermally) - converting nurbs to mesh was casting the material to unsigned char. - subsurf was casting to char, then int -> short in a loop. - have material functions take & return shorts.
  texface - quick speedup I doubt this makes any difference but still, good practises are always good.
  ...

Conflicts:
	source/blender/makesdna/DNA_userdef_types.h
Merge branch 'master' into idea147

* master: (599 commits)
  BGE Action Actuator fixes:   * Ping pong now has the same behavior as 2.59.   * Setting the frame on a animation playing in reverse now works correctly   * The frames for continuous were a frame or so behind, this is now fixed.
  fix for crash when entering in non unicode ascii chars.
  utf8 osx - up and down keys are producing utf8 output. muting them out in cocoa
  added function BKE_library_filepath_set which sync's the libraries absolute path when setting to a relative value, before this you could never be sure if a libraries absolute path was valid or not because the user might have changed the relative library path in the outliner, now setting from the outliner and py/rna syncs the absolute path.
  Another set of UI messages fixes and tweaks! No functional changes.
  Fix for commit 41227 (Some opening comment tags (/*) were lost!).
  Remove some more $Id$ that still were left after r41227 and r41228.
  Remove the svn:keywords property.
  fix for error in last commit and remove some more Id's I missed
  remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
  Typo fixes for the typo fixes. :D
  fix some typo's
  - fix for error with utf8 textinput for buttons - ensure input is valid utf8 from ghost and NULL then complain if its not. - added function to get utf8 size BLI_str_utf8_size()
  Code refactoring: split main 3d view drawing function into object drawing and info overlay drawing functions.
  RNA: fix collection iterator issue in c++ api with msvc.
  committing 'a' to merge into the tag
  minor formatting edits (80 char width)
  set pythons 'sys.stdout' encoding to utf-8 and use surrogateescape error handler.
  rna access to event.unicode so scripts can get unicode text input.
  py/rna api crash fix: getting event.ascii would crash blender (strange nobody noticed this, seems its been there for over a year???).
  ...
Merge branch 'master' into idea147

* master: (213 commits)
  svn update
  Add new external translations module - release/datafiles/locale Master merged upto latest trunk commit to match first addition of locale submodule
  update addon scripts
  update translation files
  more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel.
  replace macros for bli math functions in editors
  replace macros with bli math functions for nodes
  Fix for bug #29046, the factor buffer input was not used correctly in curve nodes.
  more macro --> bli math lib replacements.
  misc macro --> bli math lib functions
  replace macros with math functions for render code
  missing files from last commit
  replace macros with bli math functions for particles code
  Second attempt at getting rid of bsystem_time()
  use BLI math functions for kdopbvh (no functional change)
  Split off 3D Cursor settings from "View" panel in 3D View
  Removed old "bsystem_time()" function, which by now is just a duplicate of BKE_curframe() which just takes two extra args.
  As discussed on the mailing list, removing the non-functional, incompatible, and unmaintainable Time Offset cruft.
  PyUnicode_From_STR_String utility function which passes STR_String to PyUnicode_FromStringAndSize (saves a call to strlen).
  remove po/ since the workflow for translations uses branches which isnt that useful to have within blenders source dir.
  ...
Merge branch 'master' into idea147

* master: (40 commits)
  Add FreeBSD fixes for libmv
  svn update
  update addon scripts
  update translation files
  Code cleanup: fix compile warning.
  Fix: incorrect use of IFACE_ macro, and correct a typo.
  - Fixed typo in KLT description tooltip - Fixed inconsistent data type used for pts number in ffmpeg_fetchibuf   and stored in timecode structure. Not really issue for "correct" movie files,   but probably can help for "broken" one
  Fix a typo in building undistorted proxies for movie clips.
  use some more logical BLI math functions & tracking used INT_MAX on a short.
  Code cleanup and small fixes:
  Tracker: * Typo fixes for space_clip.py, patch by Mike S on the mailing list.
  Code cleanup - reshuffling some stuff to avoid buildup of long functions in transform code again
  cmake & pep8 tidy up, also some style edits.
  SVN maintenance.
  UI/Nodes: templates to edit nodes from the properties editor using a tree view, to be used by cycles. For testing there's a panel in the node editor if you set debug to 777, didn't enable it because I'm not sure it's very useful there.
  Nodes: add foreach_nodeclass iterator over node classes, use for node add menu.
  Fix [#29194] Spelling error (yes sir, it is a bugfix :P ).
  Hopefully compilation with MinGW will work again. Tested with official MinGW and SCons, not sure how ti check it when using CMake.
  Textures/Shaders: extend TexMapping to include projection options, and add a ColorMapping struct for color manipulation of textures. These will be the standard built-in texture node options for manipulating the incoming texture coordinate and outgoing color.
  Nodes: add socket option to hide the default value in the UI, to be used for sockets that get their default value if no node is connected from elsewhere, e.g. a texture coordinate.
  ...
Merge branch 'master' into idea147

* master: (25 commits)
  svn update
  update addon scripts
  SVN maintenance.
  don't overwrite existing CMAKE_CXX_FLAGS for cycles (they may be important)
  Remove redundant .remove()
  Fix GLEW linking error on MinGW. The __imp__ prefix on glew lib linking errors should have been a good indication: the code was looking for the glew dll. Bypassed by adding GLEW_STATIC to the definitions.
  Cycles: fix crash loading existing files, forgot to merge over this line.
  quiet warning
  stop cmake from overwriting BOOST_ROOT and OPENIMAGEIO_ROOT_DIR which the builder is supposed to be able to set.
  Cycles Merge: * It seems we have a problem compiling the CUDA kernel at runtime on Windows,   will need to investigate more how to solve this best, CPU render should go   fine though. * Change OPENIMAGEIO to OPENIMAGEIO_ROOT_DIR on linux for consistency.
  Update MinGW to use correct lib location for boost
  Cycles Merge
  - operator presets now work in the 3D view as well as the file selector.
  Fix compile after audaspace file source.remove..
  Don't compile AUD_JOSResampleReaderCoeff.cpp twice (it's included in AUD_JOSResampleReader.cpp)
  Fix #29201: movie clip editor - right click crashes blender
  *Correct syntax for static, since we invoke g++ as linker and we have to pass it to ld. *CMakefile: Update boost and OpenImageIO libraries for MinGW like in the cycles branch
  Fix #29198: Problem with text interface when you enable the International fonts
  - disable undo for user preferences (every click would do push an undo), was noticeable on large files. - also netbeans project file generator now uses branch name for project.
  Attempt to fix #29200: Camera Tracking Solver
  ...
Merge branch 'master' into idea147

* master: (53 commits)
  svn update
  update addon scripts
  Dynamic Paint UI: * Code cleanup, changed some splits to row's, much nicer when you only use 2 properties in a row. * if > elif * Removed some duplicated code for an if/elif/else check
  2.6 Physics UI Files: * Remove redundant check for md, this is already done in the super class poll.
  SVN maintenance.
  Mark unused variable.
  Cycles: fix missing particle panels and show emitter option not being respected.
  Cycles: attempt to fix build issue with mingw.
  Cycles: * Fix excessive fireflies in Velvet BSDF (patch by David). * Disable some unused SSE code * Remove RTTI disabling flags for now, this is giving some compile issues and   was only needed of OSL which we're not using yet.
  Cycles: attempted fix for error building with sse/mtune optimization flags.
  Cycles: fix crash in image assign/remove in image editor.
  Nodes: fix crash loading old files that have node sockets changed, the version patch for the default value storage needs to be done before lib linking, otherwise this can crash. Fixes problem opening some old cycles files.
  Fix [#29214] build modifier calculates wrong fraction of faces/verts/edges to draw
  Cycles: when material/world/lamp doesn't use nodes, show color in the UI.
  Dynamic Paint: * Added BKE_dynamicpaint.h to CMake list. * Changed some unsigned integers back to signed, as OpenMP can't iterate unsigned values anyway. * Fixed more warnings.
  Cycles: many of the new nodes were not showing properties/buttons in nodes in the node editor.
  Cycles: * Add back option to bundle CUDA kernel binaries with builds. * Disable runtime CUDA kernel compilation on Windows, couldn't get this working,   since it seems to depend on visual studio being installed, even though for   this particular case it shouldn't be needed. CMake only at the moment. * Runtime compilation on linux/mac should now work if nvcc is not installed in   the default location, but available in PATH.
  quiet some warnings from recent merge
  Fixed possible issue drawing undistorted clip in clip editor. Check for marker's visibility was a bit odd.
  Restored GPL header of NOD_composite.h (funny s&r ?!?).
  ...
Merge branch 'master' into idea147

* master: (56 commits)
  svn update
  update addon scripts
  SVN maintenance.
  Moving all node angle-type values to radians. This also fixes [#29151] rotate node wrong input (mixing up radians and degrees).
  Fix #29240: multi-res bake broken in 2.60
  svn update
  update addon scripts
  Camera solving: fixed incorrect warnings about failure of solving some frames
  Quiting a warning in Ocean code (commenting out var).
  new math utility function isect_plane_plane_v3
  Release cycle: Moving on to BCon 3: beta
  remove double promotions and some formatting edits (tabs & spaces mixed)
  remove Id:'s from shader node headers
  Make Ocean modifier compile again! Also removed it’s $ID$ heading stuff.
  ensure that the path and directory are joined correctly for ocean cache (assumed path ended with a '/')
  Scons_buildsystem: add WITH_BF_OCEANSIM = True to all configs
  Ocean Sim: sort alphabetically in modifier list, fix python error trying to show "Built without OceanSim modifier" message.
  add the ocean modifier to bpath visitor
  Stub data in Ocean modifier when disabled, C standard does not allow empty structs.
  pep8 edits
  ...
Merge branch 'master' into idea147

* master: (129 commits)
  update addon_contrib scripts
  svn update
  Add new addons_contrib submodule
  update addon scripts
  addons in contrib now have their own 'Testing' category which is off by default.
  exclude addons_contrib/ for release builds.
  Tweaks and fixes to UI messages, found while translating in french.
  add flag FUNC_USE_MAIN for rna functions which don't need the context. (currently unused)
  centralize some of the came install commands, were being copied between osx/win/linux
  adding addons_contrib as an external so we better test scripts before moving into release, for more info:   http://wiki.blender.org/index.php/User:Ideasman42/ProposalAddonsContrib
  pyapi feature from 2.4x
  Fixed comment in BLI_dlrbTree_search_exact
  pydrivers: 'frame' is now in the driver namespace,
  pass encoding to uses of decode() incase the default isnt utf-8. ignore decode errors in some cases.
  svn update
  update addon scripts
  BLI_mempool redefined causing compile time error, removing duplicate typedef
  UI: editor splitting widgets in corners now draw antialiased, also fix 1 pixel inconsistency between bottom-left and top-right.
  Fix [#29190] VSE bugs.
  merge mempool changes from bmesh (adds mempool iterator).
  ...
Merge branch 'master' into planettexture

* master: (129 commits)
  update addon_contrib scripts
  svn update
  Add new addons_contrib submodule
  update addon scripts
  addons in contrib now have their own 'Testing' category which is off by default.
  exclude addons_contrib/ for release builds.
  Tweaks and fixes to UI messages, found while translating in french.
  add flag FUNC_USE_MAIN for rna functions which don't need the context. (currently unused)
  centralize some of the came install commands, were being copied between osx/win/linux
  adding addons_contrib as an external so we better test scripts before moving into release, for more info:   http://wiki.blender.org/index.php/User:Ideasman42/ProposalAddonsContrib
  pyapi feature from 2.4x
  Fixed comment in BLI_dlrbTree_search_exact
  pydrivers: 'frame' is now in the driver namespace,
  pass encoding to uses of decode() incase the default isnt utf-8. ignore decode errors in some cases.
  svn update
  update addon scripts
  BLI_mempool redefined causing compile time error, removing duplicate typedef
  UI: editor splitting widgets in corners now draw antialiased, also fix 1 pixel inconsistency between bottom-left and top-right.
  Fix [#29190] VSE bugs.
  merge mempool changes from bmesh (adds mempool iterator).
  ...
Merge branch 'master' into planettexture

* master: (67 commits)
  svn update
  update addon_contrib scripts
  Remove sensor height from Sony A55 preset. Sensor height isn't supported by motion tracking yet.
  Fix for crasher when node group tree datablocks are missing.
  Muting node patch: second part. Also fix [#27636] Muting shading nodes is ignored
  Tag unused variable in recent nodes commit.
  Fix #29295: Problem with Alpha Channel video in Sequencer and textures
  Fix compilation error with oceansim disabled
  Muting node patch: first part
  == Sequencer / FFMPEG ==
  More UI messages fixes and tweaks (found while translating in french).
  share code for fluidsim, ocean & dynamic paint file paths. - use BLI_join_dirfile for joining all paths (no need to ensure slash is appended). - paths from linked library files now supported.
  * UI fix for recent Ocean Foam change, makes it a bit more compact.
  UI: fix issue with part of panels going offscreen after recent commit.
  Option to rename the vertex color data layer used by Ocean modifier for foam. The modifier outputs foam values to both textures and a (temporary) vertex data layer. This layer was unnamed before, which makes it impossible to access in shader nodes. Now the user can input a custom name in the modifier panel, then use that same name in a shader input node to access foam values.
  RNA: fix compile issue with zero size arrays with old gcc.
  Tweaks in convert tracking constraint to f-curves operator.
  Fix #29322: 'Active Clip' not saving after appending.
  Dynamic Paint: * Vertex color output now works even if there is a constructive modifier, like ocean sim, before dpaint. * Fixed a crash when canvas mesh had no vertices. * Fix: Smudge was also processed for incompatible surface types causing corrupted output.
  dist_to_plane_v3 was incorrectly flipping the value (own mistake when adding)
  ...

Conflicts:
	source/blender/blenkernel/intern/node.c
	source/blender/nodes/NOD_texture.h
Merge branch 'master' into idea147

* master: (1080 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  update translation files
  - Fix for commit 43551 which caused a linking error in blenderplayer. - Minor clean up for commit 43551.
  misc changes from bmesh, syncing across to trunk, no functional changes
  - Added functions to remove mesh vertices, edges and faces. These functions remove a specified number of elements from the end of their respective arrays. For example, removing two vertices removes the last two vertices of the mesh. - Minor fixes to descriptions of add edge and add face functions.
  Small cleanup to parameters of _getSubSurf().
  smart stitch ============= * refactoring, separate common functionality to functions. * enable each uv to check independently for other stitchable uvs. This allows to limit stitch uvs belonging to the same vertex, while previously this was impossible. * made changes to island rotation when calculated from sole uvs when using midpoint stitch. It should now be evenly distributed across islands.
  Minor code enhancement (replace for loops with while's, and avoid multiple checks to get good face vertex index). No functional changes.
  Add missing labels to sculpt/paint sliders.
  Remesh Modifier UI: * Some tweaks to the modifier UI * Hide sharpness property, instead of greying out. The policy is to use greying out when a property depends on a boolean, if it depends on an enum item, hide it.
  Fix issue in recent color commits, was still doing a multiplication by 255 too many, also don't check uchar range after casting to int, this can still cause overflow with large float values.
  simplify clipping loop
  style edits - < 120 line width
  size for static string was too small, we should really have dynamic sized strings to rna functions.
  yRemove missed/unused "tweak" property from keymap for outliner's border select
  Dynamic Paint: * Added "Project" option also for "Volume + Proximity" brush type.
  use color conversions functions in more places. also add rgba_float_to_uchar, rgba_uchar_to_float
  Baked edit: Make particle edit mode more usable for Softbodies and Cloth (jahka gave "OK")
  ...
Merge branch 'master' into planettexture

* master: (1013 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  update translation files
  - Fix for commit 43551 which caused a linking error in blenderplayer. - Minor clean up for commit 43551.
  misc changes from bmesh, syncing across to trunk, no functional changes
  - Added functions to remove mesh vertices, edges and faces. These functions remove a specified number of elements from the end of their respective arrays. For example, removing two vertices removes the last two vertices of the mesh. - Minor fixes to descriptions of add edge and add face functions.
  Small cleanup to parameters of _getSubSurf().
  smart stitch ============= * refactoring, separate common functionality to functions. * enable each uv to check independently for other stitchable uvs. This allows to limit stitch uvs belonging to the same vertex, while previously this was impossible. * made changes to island rotation when calculated from sole uvs when using midpoint stitch. It should now be evenly distributed across islands.
  Minor code enhancement (replace for loops with while's, and avoid multiple checks to get good face vertex index). No functional changes.
  Add missing labels to sculpt/paint sliders.
  Remesh Modifier UI: * Some tweaks to the modifier UI * Hide sharpness property, instead of greying out. The policy is to use greying out when a property depends on a boolean, if it depends on an enum item, hide it.
  Fix issue in recent color commits, was still doing a multiplication by 255 too many, also don't check uchar range after casting to int, this can still cause overflow with large float values.
  simplify clipping loop
  style edits - < 120 line width
  size for static string was too small, we should really have dynamic sized strings to rna functions.
  yRemove missed/unused "tweak" property from keymap for outliner's border select
  Dynamic Paint: * Added "Project" option also for "Volume + Proximity" brush type.
  use color conversions functions in more places. also add rgba_float_to_uchar, rgba_uchar_to_float
  Baked edit: Make particle edit mode more usable for Softbodies and Cloth (jahka gave "OK")
  ...

Conflicts:
	source/blender/makesrna/intern/rna_texture.c
Merge branch 'master' into idea147

* master: (419 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  update translation files
  #collada animation import, bugfix #29082
  SVN maintenance.
  - Fixed linking errors of blender player with CMake and XDND enabled - Rest of changes to make XDND switch-off-able: link against extern_xdnd only   if XDND is enabled
  glog should now compile fine at FreeBSD 9 platform
  XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons
  remove section in gotcha's doc about matrix col/row order since this has been changed.
  * Remove Cycles preset dir again, presets subdirs in addons/*/ are not supported...
  Fixed compilation error cased by recent refactor of include guard defines.
  Cycles Presets: * New presets folder in the addon folder.
  patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes
  unify include guard defines, __$FILENAME__
  Use BLF API to check whether translation is enabled, when possible!
  add note to avoid confusion with angle_v3v3v3, also minor change with angle comparison, convert constant values to radians (not resulting angle to deg).
  Returning magic _USE_MATH_DEFINES to esm tracker. Needed to make constants like M_E defined in msvc. Was occasionally removed on moving main changes in libmv from patch files in blender repo to won repo (rev44190).
  In fact, snapping in particle edit mode also might make sense. Pardon for extra noise..
  Revert part of own recent header cleanup: pivot and manipulators in fact makes sense in particle edit mode.
  ...
Merge branch 'master' into planettexture

* master: (419 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  update translation files
  #collada animation import, bugfix #29082
  SVN maintenance.
  - Fixed linking errors of blender player with CMake and XDND enabled - Rest of changes to make XDND switch-off-able: link against extern_xdnd only   if XDND is enabled
  glog should now compile fine at FreeBSD 9 platform
  XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons
  remove section in gotcha's doc about matrix col/row order since this has been changed.
  * Remove Cycles preset dir again, presets subdirs in addons/*/ are not supported...
  Fixed compilation error cased by recent refactor of include guard defines.
  Cycles Presets: * New presets folder in the addon folder.
  patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes
  unify include guard defines, __$FILENAME__
  Use BLF API to check whether translation is enabled, when possible!
  add note to avoid confusion with angle_v3v3v3, also minor change with angle comparison, convert constant values to radians (not resulting angle to deg).
  Returning magic _USE_MATH_DEFINES to esm tracker. Needed to make constants like M_E defined in msvc. Was occasionally removed on moving main changes in libmv from patch files in blender repo to won repo (rev44190).
  In fact, snapping in particle edit mode also might make sense. Pardon for extra noise..
  Revert part of own recent header cleanup: pivot and manipulators in fact makes sense in particle edit mode.
  ...
Merge branch 'master' into idea147

* master: (37 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  add type check asserts for bmesh operator get/set funcs so errors wont fail silently.
  added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious.
  fix [#30266] B-Mesh: Issue with Weight Painting
  minor edits to have the game engine and player building.
  for bake check polygon texface (not tessface-texface)
  fix harmless but annoying memory leak prints, "newmem", now free all scanfill memory on exit.
  missed cleaning up ScanFillEdge last commit
  - remove some unused editmesh functions. - copy & rename EditMesh stricts for use with scanfill (remove unused members)
  Bugfix (missed one code line): Copy paste induced bug found by Sv. Lockal.
  Bugfix: Copy paste induced bug found by Sv. Lockal.
  SVN maintenance.
  B-Mesh: * Remove Doubles was missing the info how many vertices were removed, added that back.
  moved select interior faces into a C function (was python)
  Smoke ------ New: Child particles are used as emitter.
  remove more unused files.
  remove files no longer used since bmesh merge.
  remove lock on source (which didnt work - locks in svn are not recursive)
  ...
Merge branch 'master' into planettexture

* master: (37 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  add type check asserts for bmesh operator get/set funcs so errors wont fail silently.
  added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious.
  fix [#30266] B-Mesh: Issue with Weight Painting
  minor edits to have the game engine and player building.
  for bake check polygon texface (not tessface-texface)
  fix harmless but annoying memory leak prints, "newmem", now free all scanfill memory on exit.
  missed cleaning up ScanFillEdge last commit
  - remove some unused editmesh functions. - copy & rename EditMesh stricts for use with scanfill (remove unused members)
  Bugfix (missed one code line): Copy paste induced bug found by Sv. Lockal.
  Bugfix: Copy paste induced bug found by Sv. Lockal.
  SVN maintenance.
  B-Mesh: * Remove Doubles was missing the info how many vertices were removed, added that back.
  moved select interior faces into a C function (was python)
  Smoke ------ New: Child particles are used as emitter.
  remove more unused files.
  remove files no longer used since bmesh merge.
  remove lock on source (which didnt work - locks in svn are not recursive)
  ...
Merge branch 'master' into idea147

* master: (434 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  update translation files
  Fix #30489: Loop Cut by Typing Numbers Is Limited to 32?
  Modified behaviour of the link-insertion operator (drag on link, request by Sebastian Koenig). This would previously attempt to find a socket with exactly matching type to the from/to sockets of the cut link, but this is annoying because it often links to the "secondary" sockets, such as Factor input in the Mix node. New behaviour is to choose the input/output for reconnection based on the "highest" (= most important) socket types (in order color, vector, value), like the autoconnect operator (FKEY) also does. It is far from ideal and will probably not work in all situations either, but until we have a detailed design for "best sockets to auto-link" this will have to do.
  Fix ##30455: Orthographic grid alignment jumps/shifts when zooming
  Knifetool: change ESC to mean cancel, not confirm.
  Partial Bugfix [#30097] : Current frame indicator on Motion Paths drawn incorrectly
  Add missing include.
  Fix #30464: Confusing lack of label for Fluid "use"
  Fix #30467: UV/Image Editor: Scope: Opacity Values maybe wrong
  Another fix due to recent DM refactoring, for compilation of navmesh...
  Compilation error fix for game engine caused by recent DM refactoring.
  Code cleanup: use named values for options in DerivedMesh drawing.
  style cleanup: pep8 + picky edits
  code cleanup: duplicate checks and double assignments.
  style cleanup - spelling.
  building without python works again, cleanup bmesh include paths (cmake and scons).
  style cleanup - remove unneeded ';'s
  ...
Merge branch 'master' into planettexture

* master: (434 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  update translation files
  Fix #30489: Loop Cut by Typing Numbers Is Limited to 32?
  Modified behaviour of the link-insertion operator (drag on link, request by Sebastian Koenig). This would previously attempt to find a socket with exactly matching type to the from/to sockets of the cut link, but this is annoying because it often links to the "secondary" sockets, such as Factor input in the Mix node. New behaviour is to choose the input/output for reconnection based on the "highest" (= most important) socket types (in order color, vector, value), like the autoconnect operator (FKEY) also does. It is far from ideal and will probably not work in all situations either, but until we have a detailed design for "best sockets to auto-link" this will have to do.
  Fix ##30455: Orthographic grid alignment jumps/shifts when zooming
  Knifetool: change ESC to mean cancel, not confirm.
  Partial Bugfix [#30097] : Current frame indicator on Motion Paths drawn incorrectly
  Add missing include.
  Fix #30464: Confusing lack of label for Fluid "use"
  Fix #30467: UV/Image Editor: Scope: Opacity Values maybe wrong
  Another fix due to recent DM refactoring, for compilation of navmesh...
  Compilation error fix for game engine caused by recent DM refactoring.
  Code cleanup: use named values for options in DerivedMesh drawing.
  style cleanup: pep8 + picky edits
  code cleanup: duplicate checks and double assignments.
  style cleanup - spelling.
  building without python works again, cleanup bmesh include paths (cmake and scons).
  style cleanup - remove unneeded ';'s
  ...
Merge branch 'master' into idea147

* master: (356 commits)
  Identify custom build in master branch so it carries across to all branches. This replaces the graphicall specification previously in mymods only.
  Update README to include all submodules needed.
  svn update
  update addon_contrib scripts
  update addon scripts
  minor speedup to vertex split function, avoid a hash lookup when its not needed.
  file selector text field and file renaming were doing undo pushes.
  edge split bmesh operator wasnt accessible (defined but not used), for some reason it had a 'numcuts' option.
  doc cleanup: minor corrections and improvements to docstrings + recent doc changes.
  more face -> tessface edits
  last commit broke cycles, also add BMESH_TODO's for python scripts that need upgrading.
  rna/python api change: rename Mesh.faces --> tessfaces, since existing scripts are using this to modify the mesh and its confusing that the edits are not kept.
  Fix for step-by-step tracking issue caused by operator presets changes
  patch [#30620] Wiki Quick Hack: Make Tooltip Text Colour Themeable from luke frisken (lfrisken), with some edits.
  patch [#30636] Enable full screen mode with SDL2 from Wander Costa (walac)
  Correction recent start/end range values for frames: it was impossible to set start frame = end frame which is useful in some cases.
  Fix for #30627. This improves the behaviour of the internal_reconnect function for dissolving, detaching and muting nodes a bit. Instead of only linking a single, perfectly matching socket pair it now connects all outputs of a type to the first input of the same. Also if no such connections can be made it simply links the first connected input to the first connected output. This is the previous behaviour of the delete_reconnect operator (ctrl+x).
  Fix for Add Movie Strip and Add Sound Strip operators and operator property re-use system.
  patch [#30635] Fix SDL2 version check by Wander Costa (walac)
  #collada skeleton animation import, fixes #29246
  ...
Merge branch 'master' into planettexture

* master: (356 commits)
  Identify custom build in master branch so it carries across to all branches. This replaces the graphicall specification previously in mymods only.
  Update README to include all submodules needed.
  svn update
  update addon_contrib scripts
  update addon scripts
  minor speedup to vertex split function, avoid a hash lookup when its not needed.
  file selector text field and file renaming were doing undo pushes.
  edge split bmesh operator wasnt accessible (defined but not used), for some reason it had a 'numcuts' option.
  doc cleanup: minor corrections and improvements to docstrings + recent doc changes.
  more face -> tessface edits
  last commit broke cycles, also add BMESH_TODO's for python scripts that need upgrading.
  rna/python api change: rename Mesh.faces --> tessfaces, since existing scripts are using this to modify the mesh and its confusing that the edits are not kept.
  Fix for step-by-step tracking issue caused by operator presets changes
  patch [#30620] Wiki Quick Hack: Make Tooltip Text Colour Themeable from luke frisken (lfrisken), with some edits.
  patch [#30636] Enable full screen mode with SDL2 from Wander Costa (walac)
  Correction recent start/end range values for frames: it was impossible to set start frame = end frame which is useful in some cases.
  Fix for #30627. This improves the behaviour of the internal_reconnect function for dissolving, detaching and muting nodes a bit. Instead of only linking a single, perfectly matching socket pair it now connects all outputs of a type to the first input of the same. Also if no such connections can be made it simply links the first connected input to the first connected output. This is the previous behaviour of the delete_reconnect operator (ctrl+x).
  Fix for Add Movie Strip and Add Sound Strip operators and operator property re-use system.
  patch [#30635] Fix SDL2 version check by Wander Costa (walac)
  #collada skeleton animation import, fixes #29246
  ...