Merge remote-tracking branch 'remotes/trunk'

* remotes/trunk: (138 commits)
  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
  own error r45225 - move defines to the top of the func. - rename T -> EPS - undefine at the end.
  code cleanup: (dont include ';' in defines), last commit also missed changes to paint_image.c
  fix [#30666] Texturepaint "Soften" brush gets stuck
  fix [#30685] Solidify tool behaves like Shrink/Fatten (editmesh functionality stuff)
  Fix [#30700] Blend from Shape gives only selection for basis shapekey
  ...

Conflicts:
	source/blender/windowmanager/intern/wm_operators.c
	source/creator/creator.c
update translation files
update addon scripts
update addon_contrib scripts
svn update
Cycles: shadow pass support. Note that this only takes into account lamps,
emitting objects or world lighting do not contribute to the shadow pass.

Consider this more as a pass useful for some compositing tricks, unlike
other lighting passes this pass can't be used to exactly reconstruct the
combined pass.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45242 954f8c5b-7b00-dc11-b283-0030488c597c
Small cleanup for r45238, remove empty/unused function.

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


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45244 954f8c5b-7b00-dc11-b283-0030488c597c
Fix testing value of undefined symbol
Merge branch 'master' into bonelayers

* 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
  ...
Fix #30551: cycles passes combining did not always give identical result combined
with antialiasing/defocus, now divide out color at the very end instead of for each
sample.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45245 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #30702: game engine softbody weld threshold was exposed in UI, but actually
disabled in code because it doesn't work well, so hide the property from the UI.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45246 954f8c5b-7b00-dc11-b283-0030488c597c
This does two things for cleanup builds made with SCons:
  1) Removes unwanted folders from Python/lib instead of just emptying them out.
  2) Removes the test folder from Python/lib. This folder contains unit tests for Python (not the unittest module itself), and is about 10~12MB.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45247 954f8c5b-7b00-dc11-b283-0030488c597c
Partial fix for array modifier vertex merge (bug 30195).

Two fixes:

* The find-doubles operator was overriding the "dirty" element
  indices, so vertices were not being mapped correctly.

* In some cases a vertex can be set to merge with a vertex that is
  also set to be merged, so added a loop to find the first unmerged
  vert in this case.

Not yet working is the "First Last" merge option.

Also made some cleanups and added comments in the array/remove doubles
code.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45248 954f8c5b-7b00-dc11-b283-0030488c597c
fix invalid *= on an un-initialized value when adding primitives.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45249 954f8c5b-7b00-dc11-b283-0030488c597c
fix [#30705] Playing animation in reverse prevents further forward playback


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45250 954f8c5b-7b00-dc11-b283-0030488c597c
fix [#30402] modules dir missing from sys.path


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45251 954f8c5b-7b00-dc11-b283-0030488c597c
Windows Blenderplayer: The console now closes when the Blenderplayer launches (like it does with Blender). To get it back, use the -c flag, which is finally working as described: "-c: keep console window open"

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45252 954f8c5b-7b00-dc11-b283-0030488c597c
skip using bmesh operators for converting to/from undo meshes (gives some speedup)


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45253 954f8c5b-7b00-dc11-b283-0030488c597c
BGE: This fixes a problem where lamps in inactive layers were rendering shadows buffers that never got used, which was a huge performance sink.

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