Blender Git Loki

Git Commits -> Revision b5ab717

October 9, 2014, 20:28 (GMT)
Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

Conflicts:
source/blender/editors/physics/CMakeLists.txt (reverse-merged from commit c9769a68082d334b002c449ad204de5acb93967b)

Commit Details:

Full Hash: b5ab717f889fac441fbc449f4f69f26bcadb2beb
Parent Commit: 1c25622
Lines Changed: +348, -339

21 Modified Paths:

/extern/bullet2/src/LinearMath/btVector3.h (+1, -0) (Diff)
/intern/rigidbody/RBI_api.h (+4, -4) (Diff)
/intern/rigidbody/rb_bullet_api.cpp (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+1, -8) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+3, -9) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/rigidbody.c (+44, -73) (Diff)
/source/blender/blenkernel/intern/softbody.c (+6, -4) (Diff)
/source/blender/blenlib/BLI_ghash.h (+0, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -2) (Diff)
/source/blender/blenloader/intern/writefile.c (+2, -4) (Diff)
/source/blender/bmesh/CMakeLists.txt (+7, -1) (Diff)
/source/blender/bmesh/intern/bmesh_opdefines.c (+2, -3) (Diff)
/source/blender/bmesh/intern/bmesh_operators.c (+23, -23) (Diff)
/source/blender/bmesh/operators/bmo_bisect_plane.c (+2, -4) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+19, -19) (Diff)
/source/blender/editors/object/object_edit.c (+0, -1) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+158, -159) (Diff)
/source/blender/makesdna/DNA_object_force.h (+1, -2) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+5, -10) (Diff)
/source/blender/makesrna/intern/rna_rigidbody.c (+66, -8) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021