Blender Git Loki

gitmodules test

merge related compile fixes

Merge branch 'master' into fracture_modifier_oldsim

Conflicts:
extern/CMakeLists.txt
source/blender/blenkernel/intern/rigidbody.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_edit.c
source/creator/CMakeLists.txt

forgot to initialize totvert variable prior to building a kdtree

fix attempt for halving case, passive groups didnt work properly there

added inner material support for boolean and bisect fill

added a fix normals option to let cracks in smooth objects nearly disappear, also rotates the vertex normals with the verts... WIP... because i need somehow to get the derivedmesh of the previous modifier in stack if there is one

added vertweight display for fracture modifier, and attempt to update data in case vgroups are changed, but this doesnt work, seems to require a refracture to interpolate data again

added vertex group support to mark passive areas of an object (which remain static)
also rudimentary ground toggle / ground connect toggle operators

compile fixes after merge

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier_oldsim

Conflicts:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/space_buttons/buttons_context.c

just crash prevention, but mesh can still be messed up when attempting to move mesh out of fracture point location, especially with greasepencil

bah, other pointsources than uniform tend to crash, this is a fix attempt for greasepencil (but generally, dont try to move the object after fracturing with greasepencil by hand....

small gui fix in regular rigidbody constraints panel

well, a crash "prevention" with autosmooth, but it doesnt work anymore with the fracture modifier this way.

added threshold vertexgroup support (a single vertexgroup with weightpainting)

reactivated modifier editmode "support" (but well, it doesnt really work...) and removed fracture edit mode (didnt work at all)

added fracture preset storage and fix for loading files -> mesh was doubled there

re-added contact distance and mass dep. thresholds, also fixed a python gui error -> override solver iterations in scene

fix for automatical recreation of constraints after loading