Blender Git Loki

Removed a code segment for debugging (not intended for a commit).

Merged changes in the trunk up to revision 44266 (including BMesh).
Freestyle edge/face marks were ported to BMesh.

Conflicts resolved:
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/blenkernel/intern/editderivedmesh.c

remove NGon Interp modifier (which was merged as apart of BMesh),
this didnt really give any advantage over subsurf's Simple-Subdiv mode.

copy over a change from bmesh branch that was needed for lightmap unpack to work, also tag some rna vars as unused.

Done BMESH_TODO in object/object_vgroup.c (make getSurroundingVerts() use polys/loops instead of tessfaces).

Also done a few optimizations of related code (OBJECT_OT_vertex_group_fix operator).

fix for leak in gpu.export_shader(), wasnt freeing the function.

also change the bmesh iterator so its possible to initialize without stepping.

Fix normals for flat-shaded non-VBO sculpt drawing.

Example here, original on left, fixed normals on right:
http://www.pasteall.org/pic/show.php?id=26925

Fix broken predivide option for reading in images, patch by Troy Sobotka.

Another fix for using boolean slot as integer. This time in dissolve operator.

Fix #30263: tweak threshold option in user preferences was incorrectly placed
under NDOF settings, but it's a mouse/tablet setting. Patch by Tobias Johansson.

Fix cmake warning on Mac, when not using Xcode generator.

Fix: cycles crash with multiple OpenCL platforms installed, tracked down by Sergey.

Fixed incorrect accessing to use_restrict as to integer slot instead of boolean

Fixed blenderplayer compile for msvc.

add type check asserts for bmesh operator get/set funcs so errors wont fail silently.

added boolean type for bmesh operators, will make python wrapping clearer and also makes existing calls more obvious.

also corrected some error reports.

fix [#30266] B-Mesh: Issue with Weight Painting

thanks to Nicholas Bishop for finding the cause of the problem.


don't tesselate on load, this means me->mface will be NULL by default.

we may need to have this set if existing uses of this array are not resolved before release - so add a define USE_TESSFACE_DEFAULT, to change this easily.


this is a rather indirect fix - need to take care here.

minor edits to have the game engine and player building.

for bake check polygon texface (not tessface-texface)

fix harmless but annoying memory leak prints, "newmem", now free all scanfill memory on exit.