Blender Git Commits

Collada and llvm both use the same functions and they clash.
Since we have older llvm for msvc2008 and new one for msvc2013 we need to work around it.

CMake: add header

Make CHECK_TYPE_NONCONST macro portable

also replace __typeof -> typeof

BMesh: typecheck iterator

Move to OIIO 1.4 also for windows x86

Spelling

CMake: tweak so 2.8.7 and older still work (disable WITH_BUILDINFO)

Cleanup: Move SpaceTransform helpers from `BKE_shrinkwrap` to `BLI_math_matrix`.

Cleanup: Move `object_get_derived_final` from BKE_shrinkwrap to BKE_DerivedMesh

Note this func needs some love, but this will be for later (should never have been in shrinkwrap code!).

Cycles: Update stdosl.h for OSL 1.5.

Cmake prefers NOT to !

Make function definition consistent with function declaration (as discussed with campbell)

Fix msvc 2013 / win64 to use new OIIO and llvm and resulting linking
requirements

Prevent macros hiding casts from `const` pointers

Make build work with llvm3.4 and oiio 1.4

Fix T41197: Blender freezes to infinite loop when switching to PAUSED Cycles rendered viewport

Revert "Fix T41226: Wrong Undo on curves and hooks"

This reverts commit e042c8428f8c0c0a72cdd23d2c058c20ab5745ed.

Proper fix will come later, or be declared a TODO.

OSX/cmake: adapt bundle structure according scons

Bake-API: cleanup - missing (size_t) promotion

OSX: updated codesigning README and removed not longer valid rule plists