Blender Git Loki

Git Commits -> Revision 462f143

April 20, 2014, 12:43 (GMT)
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

Commit Details:

Full Hash: 462f1436c3cf0a49136c4fb4c67eef5e7648580f
Parent Commits: 1972f7b, 30467f8

Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18 MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2019