Blender Git Loki

svn merge ^/trunk/blender -c60814 -c60848

Merge two more small fixes for the release.

Merging r60854 through r60868 from trunk into soc-2013-depsgraph_mt

Revert own r60813, should never have been made here!

svn merge -c -60813 .

Merging r60847 through r60853 from trunk into soc-2013-depsgraph_mt

Avoid spawning local evaluation contexts

Instead of creating local one, make sure either context
from Render or G.main is used.

Make evaluatio ncontext a part of render strcture

That's how it's supposed to be actually.

Merging r60471 through r60846 from trunk into soc-2013-depsgraph_mt

svn merge -c -60753 URL/trunk

Remove fix from revision 60753, it introduced another bug and was a minor issue
anyway, so leave it out of release.

Merged revision(s) 60651-60838 from trunk/blender into soc-2013-dingto.

Style cleanup: Coding Style.

More complete handling of printf formatting in msgid/msgstr checks.

svn merge ^/trunk/blender 60616:60786

The system can now iterates to improve the solution found.
The system at each iteration estimated in a better way the rotation of the differential coordinates

merge with trunk -r60676

svn merge ^/trunk/blender -c60760

svn merge ^/trunk/blender -c60579 -c60599 -c60605 -c60626 -c60630 -c60635 -c60639 -c60644 -c60649 -c60673 -c60674 -c60675 -c60680 -c60682 -c60683 -c60685 -c60689 -c60695 -c60703 -c60707 -c60708 -c60709 -c60712 -c60712 -c60723 -c60724 -c60731 -c60740 -c60742 -c60743 -c60747 -c60749 -c60752 -c60753 -c60753 -c60755

Merged revisions 60248-60717 from trunk/blender

svn merge -r60422:60726 ^/trunk/blender

merge with trunk -r60675, should solve some ocio compilation issues.

Do not solve the system again if a initial solution was not found