Blender Git Loki
Git Commits -> Revision 028df92
Revision 028df92 by Martin Felke (temp-fracture-modifier-2.8) November 25, 2018, 12:59 (GMT) |
removed accidental code merge failures |
Commit Details:
Full Hash: 028df92b64656cf2b0fd45e78cedbf8f4d295e8b
Parent Commit: 96140b7
Lines Changed: +77, -200
1 Deleted Path:
/readme.md (+0, -16)
51 Modified Paths:
/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h (+0, -5) (Diff)
/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h (+1, -1) (Diff)
/extern/CMakeLists.txt (+0, -1) (Diff)
/extern/voro++/CMakeLists.txt (+0, -2) (Diff)
/intern/cycles/render/image.cpp (+0, -4) (Diff)
/release/scripts/modules/bpy/path.py (+0, -9) (Diff)
/release/scripts/startup/bl_ui/properties_physics_softbody.py (+0, -3) (Diff)
/source/blender/alembic/intern/abc_customdata.cc (+0, -1) (Diff)
/source/blender/blenkernel/BKE_blender_version.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_brush.h (+0, -2) (Diff)
/source/blender/blenkernel/BKE_deform.h (+0, -2) (Diff)
/source/blender/blenkernel/BKE_mball_tessellate.h (+0, -7) (Diff)
/source/blender/blenkernel/BKE_object_deform.h (+7, -0) (Diff)
/source/blender/blenkernel/intern/blendfile.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/mask_evaluate.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/mball_tessellate.c (+15, -26) (Diff)
/source/blender/blenkernel/intern/mesh_evaluate.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/writeffmpeg.c (+2, -2) (Diff)
/source/blender/blenlib/BLI_edgehash.h (+0, -1) (Diff)
/source/blender/blenlib/BLI_heap.h (+0, -4) (Diff)
/source/blender/blenlib/BLI_math_geom.h (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+0, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+0, -1) (Diff)
/source/blender/bmesh/intern/bmesh_edgeloop.c (+2, -2) (Diff)
/source/blender/depsgraph/DEG_depsgraph.h (+0, -3) (Diff)
/source/blender/depsgraph/DEG_depsgraph_query.h (+3, -3) (Diff)
/source/blender/depsgraph/intern/depsgraph_query_iter.cc (+3, -3) (Diff)
/source/blender/editors/animation/keyframes_general.c (+4, -3) (Diff)
/source/blender/editors/interface/interface_handlers.c (+20, -13) (Diff)
/source/blender/editors/interface/interface_intern.h (+2, -0) (Diff)
/source/blender/editors/interface/interface_layout.c (+0, -4) (Diff)
/source/blender/editors/mesh/editmesh_bevel.c (+0, -4) (Diff)
/source/blender/editors/mesh/editmesh_inset.c (+0, -5) (Diff)
/source/blender/editors/object/CMakeLists.txt (+1, -1) (Diff)
/source/blender/editors/object/object_add.c (+0, -2) (Diff)
/source/blender/editors/object/object_transform.c (+0, -27) (Diff)
/source/blender/editors/physics/physics_fluid.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+1, -0) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+0, -4) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+0, -5) (Diff)
/source/blender/editors/transform/transform.c (+0, -5) (Diff)
/source/blender/editors/transform/transform_input.c (+0, -6) (Diff)
/source/blender/makesrna/intern/rna_meta.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+0, -1) (Diff)
/source/blender/modifiers/intern/MOD_remesh.c (+0, -5) (Diff)
/source/blender/render/intern/source/bake_api.c (+0, -1) (Diff)
/source/blender/windowmanager/intern/wm_jobs.c (+1, -2) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+8, -0) (Diff)
/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h (+1, -1) (Diff)
/extern/CMakeLists.txt (+0, -1) (Diff)
/extern/voro++/CMakeLists.txt (+0, -2) (Diff)
/intern/cycles/render/image.cpp (+0, -4) (Diff)
/release/scripts/modules/bpy/path.py (+0, -9) (Diff)
/release/scripts/startup/bl_ui/properties_physics_softbody.py (+0, -3) (Diff)
/source/blender/alembic/intern/abc_customdata.cc (+0, -1) (Diff)
/source/blender/blenkernel/BKE_blender_version.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_brush.h (+0, -2) (Diff)
/source/blender/blenkernel/BKE_deform.h (+0, -2) (Diff)
/source/blender/blenkernel/BKE_mball_tessellate.h (+0, -7) (Diff)
/source/blender/blenkernel/BKE_object_deform.h (+7, -0) (Diff)
/source/blender/blenkernel/intern/blendfile.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/mask_evaluate.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/mball_tessellate.c (+15, -26) (Diff)
/source/blender/blenkernel/intern/mesh_evaluate.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/writeffmpeg.c (+2, -2) (Diff)
/source/blender/blenlib/BLI_edgehash.h (+0, -1) (Diff)
/source/blender/blenlib/BLI_heap.h (+0, -4) (Diff)
/source/blender/blenlib/BLI_math_geom.h (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+0, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+0, -1) (Diff)
/source/blender/bmesh/intern/bmesh_edgeloop.c (+2, -2) (Diff)
/source/blender/depsgraph/DEG_depsgraph.h (+0, -3) (Diff)
/source/blender/depsgraph/DEG_depsgraph_query.h (+3, -3) (Diff)
/source/blender/depsgraph/intern/depsgraph_query_iter.cc (+3, -3) (Diff)
/source/blender/editors/animation/keyframes_general.c (+4, -3) (Diff)
/source/blender/editors/interface/interface_handlers.c (+20, -13) (Diff)
/source/blender/editors/interface/interface_intern.h (+2, -0) (Diff)
/source/blender/editors/interface/interface_layout.c (+0, -4) (Diff)
/source/blender/editors/mesh/editmesh_bevel.c (+0, -4) (Diff)
/source/blender/editors/mesh/editmesh_inset.c (+0, -5) (Diff)
/source/blender/editors/object/CMakeLists.txt (+1, -1) (Diff)
/source/blender/editors/object/object_add.c (+0, -2) (Diff)
/source/blender/editors/object/object_transform.c (+0, -27) (Diff)
/source/blender/editors/physics/physics_fluid.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+1, -0) (Diff)
/source/blender/editors/space_outliner/outliner_select.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+0, -4) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+0, -5) (Diff)
/source/blender/editors/transform/transform.c (+0, -5) (Diff)
/source/blender/editors/transform/transform_input.c (+0, -6) (Diff)
/source/blender/makesrna/intern/rna_meta.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+0, -1) (Diff)
/source/blender/modifiers/intern/MOD_remesh.c (+0, -5) (Diff)
/source/blender/render/intern/source/bake_api.c (+0, -1) (Diff)
/source/blender/windowmanager/intern/wm_jobs.c (+1, -2) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+8, -0) (Diff)