Blender Git Loki

Revision 17074c2 by Nathan Vollmer (soc-2016-pbvh-painting)

July 2, 2016, 00:59 (GMT)

merged master, but something in the merge broke my windows build, so I had to change something. Also fixed a bug in mirrored painting.

Full Hash: 17074c2871a7ad5d2a45d194e33376dc0aaa598b
Parent Commit: df349b0
Lines Changed: +27, -23

/source/blender/collada/collada_utils.cpp (+4, -2) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+23, -21) (Diff)