Blender Git Loki

Bugfix #27692

Render + compositing error:
When adding renderlayer nodes in a composite, without having own
scene render, the renderlayer nodes were not tagged as changed,
causing compositing to give previous result.

fix for incorrect bake api usage. but not a bug.

since render branch isnt planned to be merged now, enable strict warning flags for cmake and tag unused vars.

Compile fix. Note that var introduction must happen at start of code block.

Fix [#26912] [Collada] Screw up with names/ids on import
Reported by Valeriy Firsov

Use the node name if it exists, fall back to id otherwise.

Fix [#26821] Import Collada: instance_node still incorrectly handled
reported by David Roy
patch submitted by Camillo Dell'mour

Apply Patch [#27454] Add simple Transparency texture import for COLLADA
submitted by Steffen Ohrendorf.

Remove redundant e usage. Energy is already multiplied into exported light. Fixes potential bug (e used uninitialised, reported by Campbell Barton on IRC).

handle SpaceType and UserPref popups

fix for python ABI search, was missing 'd'

Fix [#27474] Blender crashes on collada import if input_set is missing
reported by Rebin Cornelius.

This needs patch from upstream report http://code.google.com/p/opencollada/issues/list?thanks=164 applied to OpenCOLLADA. lib/windows/collada and lib/win64/collada have already been updated. Ensures we don't read past array boundaries.

Fix #27703: reflection texture coordinates + nodes not working right in GLSL.

fix [#27700] Add effect strip ignore channel argument

small fix, This enables correction of the tangent when normal mapping is in use and tangent lighting will be used

fix [#27664] startup.blend - manipulator user-prefs
regarding issues in the report
1) fixed in previous commit.
2) intentional leaving as is.
3) left 'handle size' as is IMHO acceptably general, edited 'hotshop' tooltip/
4) corrected default values.

changes to startup.blend
- enable manipulator option, applies to new 3d views (not sure why it was disabled) - reported in [#27664]
- remove rigify and netrender scene ID properties
- set console scrollback to 256, was 128 which could sometimes cut off output of help()
- enabled syntax highlighting and line number in the text editor for game logic and python screens

- add example for python rna property update
- edit the copyright for blender specific cmake find modules

small safety fix for recent commit to normal mapping (uninitialised variables)

small fix to turntable mode, first attempt at trackball code, ndof now respects view locking and updates 'User Persp' etc.

By Morten S. Mikkelsen; this adds support for tangent bump shading

left: legacy bump, righ: sparkybump

http://pasteall.org/pic/show.php?id=13875

bugs [#26320], [#27506]

there's still an issue with texture OSA as you can see