Merge branch 'master' into outlinerfilter

* master: (63 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  Fix for compilation error when using scons and carve is disabled
  modifier Apply as Shape is now Apply as Shape Key. Was confusing some users
  Cloth: Add "velocity damping" to damping options. This will help with the "cloth wobbling" problem which accurs quite often when having animated characters with cloth.
  Fix for "[#29911] Crash on reading BL_ActionActuator.channelNames"
  Cycles UI: * Add World ID Block to World Shader Nodes.
  Cycles Textures: * Remove the "Use nodes" button, the TextureOutput node was never ported to trunk from the cycles branch.
  Cycles UI: * Use full width for the world sample as lamp properties
  Ocean Modifier UI fixes: * Modifier Icon was missing in the outliner * Fluid icon was used in the rna struct, fixed
  Committing patch "[#27676] Change window size/resolution in realtime" by me.
  restrict stitching of same island uvs to only midpoint, without snapping case
  minor edit for operator error macro so it can return different values.
  error in outliner parent patch - was using set string on an enum property.
  Add weight preview to WeightVG modifiers, and first, simple/basic refactor of how modifiers can generate preview.
  Quiet warnings in text editor
  use inline BLI_math functions for dot product and length calculation.
  Fix for the Sculpt UI (revert part of 43535 by nicholasbishop) * Such labels like for "use_space_atten" should not be in the UI, thats too overkill. Toolbar is meant to be small in size.
  Fix #29935: missing cycles update/crash when removing world datablock form scene.
  ...

Conflicts:
	source/blender/editors/include/UI_resources.h
	source/blender/editors/interface/resources.c
	source/blender/makesdna/DNA_userdef_types.h
	source/blender/makesrna/intern/rna_userdef.c
Merge branch 'master' into outlinerfilter

* master: (356 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 outlinerfilter

* 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 outlinerfilter

* 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 outlinerfilter

* 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
  ...

Conflicts:
	source/blender/editors/interface/resources.c
Merge branch 'master' into outlinerfilter

* master: (143 commits)
  Fix testing value of undefined symbol
  svn update
  update addon_contrib scripts
  update addon scripts
  update translation files
  expose image render_slot so keybindings can be configured to change
  Cycles: add alpha output to image node.
  Cycles: add rendered draw mode option in 3d view header to show the active render layer rather than the viewport layers.
  Cycles: viewport rendered draw mode now shows background images, also changed the image editor checkerboard pattern to be the same as cycles viewport.
  bmesh: be more strict with operator string formatting, no tabs and only accept slot=%x style.
  print error if rip does nothing (rather then grabbing the unripped verts as it did before)
  Fix for the node tree nodes.new API function, this wasn't setting the scene and main context pointers in the node template, used by file output node. Also the file output node itself now works in case of scene==NULL (might happen in some contexts).
  remove dissolve keybinding, conflicts with draw, add back to delete menu.
  fix [#30699] blender crashes when dissolving faces
  code cleanup: Ctrl+Click extrude - replace inline axis/angle to matrix conversion with a call to axis_angle_to_mat3()
  fix for vertex rip
  fix [#30701] bmesh: segfault when ripping partially connected vertices
  style cleanup: for creator.c & more useful assert message (file:line)
  style cleanup
  style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
  ...
Merge branch 'master' into outlinerfilter

* master: (71 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  fix for [#30738] Shading smooth/flat instability
  Fix for is_orthogonal check which in fact was checking for orthonormal matrix. Separated it into two functions so now it'll be clear if check happens for orthonormal or just orthogonal.
  Fixing kyrgyz language (code is ky_KG, just ky does not work...).
  Small array modifier performance improvement.
  Minor code cleanups for bmo_dupe.c.
  style cleanup: text editor
  code cleanup: use uppercase defines and change drawFCurveFade into static function.
  code cleanup: use uppercase for defines and dont end macro's with ;
  move debug flag into its own global var (G.debug), split up debug options.   --debug   --debug-ffmpeg   --debug-python   --debug-events   --debug-wm
  Fix bug 30195, Array modifier fails to merge vertices.
  For BMesh functions that test flags, add enabled/disabled variants.
  Add BMO function to append to a buffer slot.
  Image editor: shortcuts 1-key to 8-key for switching between render slots, patch by Damir Prebeg.
  Node socket values now only have soft limits, rather than hard limits, so you can type in any value, and only when sliding the number value there is a limit. It was already possible to assign any value to a socket with node linking, so this shouldn't cause any new issues.
  Fix #30708: pressing escape in the color picker popup did not reset to the previous color.
  Fix out-of-date slot type sizes.
  Fix [#30709] Renaming a bone renames all drivers' targets using a bone of that name, regardless of the armature.
  ...

Conflicts:
	source/blender/editors/interface/resources.c
Merge branch 'master' into outlinerfilter

* master: (187 commits)
  svn update
  update addon_contrib scripts
  update addon scripts
  update translation files
  Fix #30843: Blender Game in Metric Mode allows only a 10m Radius for Collision Bounds.
  update preview.blend so it doesn't need to convert from mfaces to mpolys every load.
  code cleanup: replace (val >> 16) with macro RNA_SUBTYPE_UNIT_VALUE(val)
  Address [#30842] Blenders Measurement Units set to Metric, makes some Precision Flaws.
  fix [#30848] Edge Selection fails when the following Conditions met:
  fix for unit system incorrectly replacint 'um' (unicode 'u'). with meters.
  expose double limit used by auto-merge, addresses bug [#30884]
  fix [#30878] Lightmap Pack > New Image does not work
  uv editor: don't draw active face stipple when the face isn't visible (error from bmesh merge), also replace 'em->bm' with 'bm' var while drawing.
  fix [#30880] Selected to Adjacent Unselected broken
  Fix own mistake with kyrgyz iso code (did not seem to bother blender, though…).
  Cycles/OpenCL: * Reverted the general activation of __KERNEL_SHADING__. Better to handle this in the device file. This way each platform gets specifically what it is capable of atm.
  Bugfix [#30835]: Cycles doesn't work with AMD Juniper GPU, compiller throws errors. Thanks for reporting!
  Fix bug 30866: prevent 2-sided polygons from knife cuts. Blender bmesh code assumes there aren't any of those, so crashed when trying to delete a vertex involved in one.
  Particle System UI: * Negate label in the Vertex Groups panel was misleading to the string buttons, rather then the check boxes. Fixed it by having 2 columns. Not ideal still, but better! :)
  Game Engine: * Scons compile fix for svn 45479.
  ...
Make outliner sort use case-insensitive compare
code cleanup:
- move lasso functions into BLI (were in 3D view but UV editor needs access)
- remove unused UV functions (ones that assumed 3-4 sized UVs only)


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46001 954f8c5b-7b00-dc11-b283-0030488c597c
add files missing from previous commit


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46002 954f8c5b-7b00-dc11-b283-0030488c597c
fix for modal timer template, wasnt updated for changes to themes.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46003 954f8c5b-7b00-dc11-b283-0030488c597c
Patch by Jose Geraldo Brito
Tracker 31061
It cures the stiff quad option and does not seem to harm.
Nowever the stiff quads behave strange in a ngom mesh. 
I can imagine that other parts in the sofybody module may be broken by the ngon structure. Well ngons and softbodies are not relly friends:
negon wants less edges softbodies would work better if more structural edges were possible

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46004 954f8c5b-7b00-dc11-b283-0030488c597c
fix for select flushing in UV-sync-selection mode (regression from 2.62), both border select and circle select failed in edge and vertex mode (though de-selecting worked ok).


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46005 954f8c5b-7b00-dc11-b283-0030488c597c
Changes to get mingw buildslaves going.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46006 954f8c5b-7b00-dc11-b283-0030488c597c
add back lasso tool in the UV editor (Ctrl+LMB / Ctrl+Shift+LMB)


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46008 954f8c5b-7b00-dc11-b283-0030488c597c
Same mingw fix as for compile

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46009 954f8c5b-7b00-dc11-b283-0030488c597c
style cleanup: changes to brace placement / newlines - for/while/if/switch


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46010 954f8c5b-7b00-dc11-b283-0030488c597c
Release Cycles for 2.64 begins.
* BCon1: Alpha. 

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46013 954f8c5b-7b00-dc11-b283-0030488c597c
fix for crash when multires subdividing a mesh with no faces (new bug in bmesh grr!)


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46014 954f8c5b-7b00-dc11-b283-0030488c597c