Blender Git Loki

Merge branch 'refs/heads/rigid_fracture' into fracture_modifier_oldsim

Conflicts:
extern/CMakeLists.txt
extern/voro++/CMakeLists.txt
extern/voro++/src/Doxyfile
extern/voro++/src/c_interface.cc
extern/voro++/src/c_interface.hh
extern/voro++/src/c_loops.hh
extern/voro++/src/container.cc
extern/voro++/src/container.hh
extern/voro++/src/container_prd.hh
extern/voro++/src/wall.cc
extern/voro++/src/worklist_gen.pl
intern/rigidbody/RBI_api.h
release/scripts/startup/bl_ui/properties_physics_softbody.py
source/blender/blenkernel/BKE_rigidbody.h
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/keyframing.c
source/blender/editors/armature/armature_edit.c
source/blender/editors/curve/editcurve.c
source/blender/editors/include/UI_view2d.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/view2d_ops.c
source/blender/editors/mask/mask_ops.c
source/blender/editors/mask/mask_select.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/physics_fracture.c
source/blender/editors/physics/physics_intern.h
source/blender/editors/screen/area.c
source/blender/editors/sculpt_paint/paint_hide.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_rigidbody_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_util.c
source/blender/windowmanager/intern/wm_event_system.c
source/blenderplayer/CMakeLists.txt

clustering for fracture

added point sources and seed

bisect fix, geometry disappeared before

missing brace caused compile errors...

fixing compile....

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

Conflicts:
extern/carve/carve-capi.cc
extern/carve/carve-capi.h
extern/carve/carve-util.cc
extern/carve/carve-util.h
extern/carve/patches/series
intern/bsp/intern/BSP_CSGException.h
release/datafiles/locale
source/blender/blenkernel/BKE_mesh.h
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesrna/intern/rna_fracture.c
source/blender/modifiers/intern/MOD_boolean_util.c
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.h

pick attempts, fail

stuck / failing attempt for picking shards :(

added (empty) fracture edit mode

integrated latest crash fix (empty mesh at union operands) from sergey

small typo fix from sergeys patch

Better handling of flipped face normals coming from voro++.

Instead of flipping the normals on the derived mesh, produce the face
loops in the correct order for shards.

Allow the fracture modifier to apply in editmode.

Fix for last terminator in voro++ output: this is just a single char.

Simplified neighbor parsing from voro++ output.

Number of neighbors is exactly the same as number of faces - each face
has one neighbor. Moved this into the face section of voro++ output too,
since it's essentially face data.

Fix for voro++ output parsing.

Use available print options from voro++ to get number of verts and loops
in advance, to avoid realloc. Also fixed bad mesh results with missing
vertices.

Removed old dummy code for fracture.

Added fracture_util.h to keep internal utility function declarations
out of the actual blenkernel header.

a bit reduction of allocs, but still needed for loops (cant determine loop count fast / reliable for now in advance)