Blender Git Commit Log
Git Commits -> Revision 676029d
Revision 676029d by Lukas Toenne (testbuild) August 1, 2014, 14:54 (GMT) |
Revert "Merge branch 'hair_system' into testbuild" This reverts commit 16759c2e6715cfd97b6433bb387411a1fdd7a6ae, reversing changes made to 5677519b0f98d1ad2e489ae76fe6071c069462e3. |
Commit Details:
Full Hash: 676029d5366157b9b0baeeefb6b6ec29444395b9
Parent Commit: 16759c2
Lines Changed: +1130, -5375
2 Added Paths:
/release/darwin/codesigning_rules_blender.plist (+14, -0) (View)
/release/darwin/codesigning_rules_player.plist (+15, -0) (View)
/release/darwin/codesigning_rules_player.plist (+15, -0) (View)
29 Deleted Paths:
/source/blender/blenkernel/BKE_hair.h (+0, -53)
/source/blender/blenkernel/BKE_mesh_sample.h (+0, -81)
/source/blender/blenkernel/intern/hair.c (+0, -189)
/source/blender/blenkernel/intern/mesh_sample.c (+0, -176)
/source/blender/blenkernel/intern/rigidbody_objects.c (+0, -863)
/source/blender/editors/physics/hair_ops.c (+0, -274)
/source/blender/editors/space_view3d/drawhair.c (+0, -297)
/source/blender/hair/CMakeLists.txt (+0, -66)
/source/blender/hair/HAIR_capi.cpp (+0, -219)
/source/blender/hair/HAIR_capi.h (+0, -69)
/source/blender/hair/intern/HAIR_curve.cpp (+0, -54)
/source/blender/hair/intern/HAIR_curve.h (+0, -100)
/source/blender/hair/intern/HAIR_debug.cpp (+0, -40)
/source/blender/hair/intern/HAIR_debug.h (+0, -69)
/source/blender/hair/intern/HAIR_math.cpp (+0, -136)
/source/blender/hair/intern/HAIR_math.h (+0, -303)
/source/blender/hair/intern/HAIR_memalloc.h (+0, -40)
/source/blender/hair/intern/HAIR_scene.cpp (+0, -154)
/source/blender/hair/intern/HAIR_scene.h (+0, -49)
/source/blender/hair/intern/HAIR_smoothing.cpp (+0, -25)
/source/blender/hair/intern/HAIR_smoothing.h (+0, -159)
/source/blender/hair/intern/HAIR_solver.cpp (+0, -355)
/source/blender/hair/intern/HAIR_solver.h (+0, -101)
/source/blender/hair/intern/HAIR_types.cpp (+0, -40)
/source/blender/hair/intern/HAIR_types.h (+0, -188)
/source/blender/makesdna/DNA_hair_types.h (+0, -72)
/source/blender/makesrna/intern/rna_hair.c (+0, -114)
/source/blender/makesrna/intern/rna_mesh_sample.c (+0, -73)
/source/blender/modifiers/intern/MOD_hair.c (+0, -131)
/source/blender/blenkernel/BKE_mesh_sample.h (+0, -81)
/source/blender/blenkernel/intern/hair.c (+0, -189)
/source/blender/blenkernel/intern/mesh_sample.c (+0, -176)
/source/blender/blenkernel/intern/rigidbody_objects.c (+0, -863)
/source/blender/editors/physics/hair_ops.c (+0, -274)
/source/blender/editors/space_view3d/drawhair.c (+0, -297)
/source/blender/hair/CMakeLists.txt (+0, -66)
/source/blender/hair/HAIR_capi.cpp (+0, -219)
/source/blender/hair/HAIR_capi.h (+0, -69)
/source/blender/hair/intern/HAIR_curve.cpp (+0, -54)
/source/blender/hair/intern/HAIR_curve.h (+0, -100)
/source/blender/hair/intern/HAIR_debug.cpp (+0, -40)
/source/blender/hair/intern/HAIR_debug.h (+0, -69)
/source/blender/hair/intern/HAIR_math.cpp (+0, -136)
/source/blender/hair/intern/HAIR_math.h (+0, -303)
/source/blender/hair/intern/HAIR_memalloc.h (+0, -40)
/source/blender/hair/intern/HAIR_scene.cpp (+0, -154)
/source/blender/hair/intern/HAIR_scene.h (+0, -49)
/source/blender/hair/intern/HAIR_smoothing.cpp (+0, -25)
/source/blender/hair/intern/HAIR_smoothing.h (+0, -159)
/source/blender/hair/intern/HAIR_solver.cpp (+0, -355)
/source/blender/hair/intern/HAIR_solver.h (+0, -101)
/source/blender/hair/intern/HAIR_types.cpp (+0, -40)
/source/blender/hair/intern/HAIR_types.h (+0, -188)
/source/blender/makesdna/DNA_hair_types.h (+0, -72)
/source/blender/makesrna/intern/rna_hair.c (+0, -114)
/source/blender/makesrna/intern/rna_mesh_sample.c (+0, -73)
/source/blender/modifiers/intern/MOD_hair.c (+0, -131)
64 Modified Paths:
/build_files/cmake/macros.cmake (+0, -1) (Diff)
/build_files/scons/config/win64-vc-config.py (+2, -3) (Diff)
/build_files/scons/tools/Blender.py (+22, -22) (Diff)
/CMakeLists.txt (+2, -9) (Diff)
/intern/cycles/blender/blender_session.cpp (+8, -20) (Diff)
/intern/cycles/kernel/shaders/stdosl.h (+0, -1) (Diff)
/intern/rigidbody/RBI_api.h (+3, -15) (Diff)
/intern/rigidbody/rb_bullet_api.cpp (+62, -108) (Diff)
/release/darwin/README_codesigning.txt (+2, -3) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+0, -22) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+0, -3) (Diff)
/source/blender/blenkernel/BKE_idprop.h (+4, -20) (Diff)
/source/blender/blenkernel/BKE_object.h (+0, -4) (Diff)
/source/blender/blenkernel/BKE_particle.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_rigidbody.h (+26, -44) (Diff)
/source/blender/blenkernel/BKE_shrinkwrap.h (+48, -3) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+0, -6) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+0, -11) (Diff)
/source/blender/blenkernel/intern/constraint.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+0, -22) (Diff)
/source/blender/blenkernel/intern/idprop.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -63) (Diff)
/source/blender/blenkernel/intern/particle.c (+0, -5) (Diff)
/source/blender/blenkernel/intern/rigidbody.c (+774, -111) (Diff)
/source/blender/blenkernel/intern/scene.c (+4, -96) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+61, -10) (Diff)
/source/blender/blenlib/BLI_math_matrix.h (+0, -16) (Diff)
/source/blender/blenlib/BLI_utildefines.h (+0, -6) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+0, -48) (Diff)
/source/blender/blenlib/intern/path_util.c (+0, -6) (Diff)
/source/blender/blenlib/intern/string.c (+2, -2) (Diff)
/source/blender/blenloader/intern/readfile.c (+0, -24) (Diff)
/source/blender/blenloader/intern/writefile.c (+3, -22) (Diff)
/source/blender/bmesh/bmesh_class.h (+4, -4) (Diff)
/source/blender/CMakeLists.txt (+0, -2) (Diff)
/source/blender/editors/armature/pose_select.c (+1, -2) (Diff)
/source/blender/editors/curve/editcurve.c (+43, -16) (Diff)
/source/blender/editors/include/BIF_gl.h (+2, -18) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+0, -2) (Diff)
/source/blender/editors/object/object_bake_api.c (+1, -1) (Diff)
/source/blender/editors/physics/CMakeLists.txt (+0, -2) (Diff)
/source/blender/editors/physics/physics_intern.h (+0, -4) (Diff)
/source/blender/editors/physics/physics_ops.c (+0, -3) (Diff)
/source/blender/editors/space_view3d/CMakeLists.txt (+0, -2) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+0, -11) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -5) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+0, -7) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+0, -19) (Diff)
/source/blender/makesdna/DNA_rigidbody_types.h (+0, -2) (Diff)
/source/blender/makesdna/intern/makesdna.c (+0, -2) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+0, -2) (Diff)
/source/blender/makesrna/intern/makesrna.c (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+0, -20) (Diff)
/source/blender/makesrna/intern/rna_rigidbody.c (+4, -4) (Diff)
/source/blender/modifiers/CMakeLists.txt (+0, -2) (Diff)
/source/blender/modifiers/intern/MOD_shrinkwrap.c (+0, -1) (Diff)
/source/blender/modifiers/intern/MOD_simpledeform.c (+5, -6) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+0, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvgproximity.c (+9, -8) (Diff)
/source/blender/modifiers/MOD_modifiertypes.h (+0, -1) (Diff)
/source/creator/CMakeLists.txt (+1, -1) (Diff)
/build_files/scons/config/win64-vc-config.py (+2, -3) (Diff)
/build_files/scons/tools/Blender.py (+22, -22) (Diff)
/CMakeLists.txt (+2, -9) (Diff)
/intern/cycles/blender/blender_session.cpp (+8, -20) (Diff)
/intern/cycles/kernel/shaders/stdosl.h (+0, -1) (Diff)
/intern/rigidbody/RBI_api.h (+3, -15) (Diff)
/intern/rigidbody/rb_bullet_api.cpp (+62, -108) (Diff)
/release/darwin/README_codesigning.txt (+2, -3) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+0, -22) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+0, -3) (Diff)
/source/blender/blenkernel/BKE_idprop.h (+4, -20) (Diff)
/source/blender/blenkernel/BKE_object.h (+0, -4) (Diff)
/source/blender/blenkernel/BKE_particle.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_rigidbody.h (+26, -44) (Diff)
/source/blender/blenkernel/BKE_shrinkwrap.h (+48, -3) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+0, -6) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+0, -11) (Diff)
/source/blender/blenkernel/intern/constraint.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+0, -22) (Diff)
/source/blender/blenkernel/intern/idprop.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -63) (Diff)
/source/blender/blenkernel/intern/particle.c (+0, -5) (Diff)
/source/blender/blenkernel/intern/rigidbody.c (+774, -111) (Diff)
/source/blender/blenkernel/intern/scene.c (+4, -96) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+61, -10) (Diff)
/source/blender/blenlib/BLI_math_matrix.h (+0, -16) (Diff)
/source/blender/blenlib/BLI_utildefines.h (+0, -6) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+0, -48) (Diff)
/source/blender/blenlib/intern/path_util.c (+0, -6) (Diff)
/source/blender/blenlib/intern/string.c (+2, -2) (Diff)
/source/blender/blenloader/intern/readfile.c (+0, -24) (Diff)
/source/blender/blenloader/intern/writefile.c (+3, -22) (Diff)
/source/blender/bmesh/bmesh_class.h (+4, -4) (Diff)
/source/blender/CMakeLists.txt (+0, -2) (Diff)
/source/blender/editors/armature/pose_select.c (+1, -2) (Diff)
/source/blender/editors/curve/editcurve.c (+43, -16) (Diff)
/source/blender/editors/include/BIF_gl.h (+2, -18) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+0, -2) (Diff)
/source/blender/editors/object/object_bake_api.c (+1, -1) (Diff)
/source/blender/editors/physics/CMakeLists.txt (+0, -2) (Diff)
/source/blender/editors/physics/physics_intern.h (+0, -4) (Diff)
/source/blender/editors/physics/physics_ops.c (+0, -3) (Diff)
/source/blender/editors/space_view3d/CMakeLists.txt (+0, -2) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+0, -11) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -5) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+0, -7) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+0, -19) (Diff)
/source/blender/makesdna/DNA_rigidbody_types.h (+0, -2) (Diff)
/source/blender/makesdna/intern/makesdna.c (+0, -2) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+0, -2) (Diff)
/source/blender/makesrna/intern/makesrna.c (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+0, -20) (Diff)
/source/blender/makesrna/intern/rna_rigidbody.c (+4, -4) (Diff)
/source/blender/modifiers/CMakeLists.txt (+0, -2) (Diff)
/source/blender/modifiers/intern/MOD_shrinkwrap.c (+0, -1) (Diff)
/source/blender/modifiers/intern/MOD_simpledeform.c (+5, -6) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+0, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvgproximity.c (+9, -8) (Diff)
/source/blender/modifiers/MOD_modifiertypes.h (+0, -1) (Diff)
/source/creator/CMakeLists.txt (+1, -1) (Diff)