Blender Git Commits

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/editors/include/ED_sculpt.h

Merge branch 'master' into soc-2013-paint

Cleanup: Make BKE_palette_ functions match our naming convention

also use const args for paint functions

Sync with master (remove diff noise)
also add WM_DRAG_NOP to show wmDragFlags use

Code cleanup: style and float<>double promotion

Spelling

Merge branch 'master' into soc-2013-paint

Added intelligent knot analysis code

Added 3dm import code for curves and untrimmed surfaces. Debugged issue with homogeneous coordinate differences between Rhino, Blender.

Adapted opennurbs to use the system zlib and removed its custom zlib library.

Initial import of .3dm (Rhino) import/export stubs, OpenMP mac+CMake build fix, and opennurbs library (along with cmake changes to build it).

Scratch shape key now exists only in EM

Stopped writing it to disk and to undo, pointless!

Stopped blender closing itself in debug build crashes on Win

TerminateProcess in creator.c crash handling prevented MSVC from seeing an
unhandled exception, now it won't so we can actually see where the problem
happened.

Merge branch 'master' into soc-2013-paint

Merge branch 'master' into soc-2013-paint

Cosmetic -- corrected odd brace placement

Added beginning of OO mesh-cut interface.

Added 3dm import code for curves and untrimmed surfaces. Debugged issue with homogeneous coordinate differences between Rhino, Blender.

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Merge branch 'master' into soc