Blender Git Loki
Git Commits -> Revision 73a09f2
Revision 73a09f2 by Lukas Toenne (hair_system) September 24, 2014, 09:36 (GMT) |
Merge branch 'hair_immediate_fixes' into hair_system |
Commit Details:
Full Hash: 73a09f2dcdfc8d52418ceb77d5c401140d56b51f
Parent Commit: 41359fe
Lines Changed: +7081, -2052
10 Added Paths:
/source/blender/editors/space_view3d/drawsimdebug.c (+140, -0) (View)
/source/blender/physics/BPH_mass_spring.h (+59, -0) (View)
/source/blender/physics/CMakeLists.txt (+52, -0) (View)
/source/blender/physics/intern/BPH_mass_spring.cpp (+718, -0) (View)
/source/blender/physics/intern/ConstrainedConjugateGradient.h (+294, -0) (View)
/source/blender/physics/intern/hair_volume.c (+542, -0) (View)
/source/blender/physics/intern/implicit.h (+182, -0) (View)
/source/blender/physics/intern/implicit_blender.c (+2154, -0) (View)
/source/blender/physics/intern/implicit_eigen.cpp (+1623, -0) (View)
/source/blender/physics/SConscript (+44, -0) (View)
/source/blender/physics/BPH_mass_spring.h (+59, -0) (View)
/source/blender/physics/CMakeLists.txt (+52, -0) (View)
/source/blender/physics/intern/BPH_mass_spring.cpp (+718, -0) (View)
/source/blender/physics/intern/ConstrainedConjugateGradient.h (+294, -0) (View)
/source/blender/physics/intern/hair_volume.c (+542, -0) (View)
/source/blender/physics/intern/implicit.h (+182, -0) (View)
/source/blender/physics/intern/implicit_blender.c (+2154, -0) (View)
/source/blender/physics/intern/implicit_eigen.cpp (+1623, -0) (View)
/source/blender/physics/SConscript (+44, -0) (View)
1 Deleted Path:
/source/blender/blenkernel/intern/implicit.c (+0, -1964)
33 Modified Paths:
/build_files/cmake/macros.cmake (+1, -0) (Diff)
/release/scripts/startup/bl_ui/properties_particle.py (+30, -0) (Diff)
/release/scripts/startup/bl_ui/properties_texture.py (+3, -0) (Diff)
/source/blender/blenkernel/BKE_cloth.h (+41, -15) (Diff)
/source/blender/blenkernel/BKE_collision.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_effect.h (+30, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+2, -2) (Diff)
/source/blender/blenkernel/intern/cloth.c (+72, -36) (Diff)
/source/blender/blenkernel/intern/collision.c (+608, -2) (Diff)
/source/blender/blenkernel/intern/effect.c (+153, -0) (Diff)
/source/blender/blenkernel/intern/particle.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+79, -18) (Diff)
/source/blender/blenkernel/SConscript (+1, -0) (Diff)
/source/blender/blenlib/BLI_math_matrix.h (+2, -1) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+10, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+12, -0) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+19, -0) (Diff)
/source/blender/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/object/object_bake_api.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+6, -0) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_cloth_types.h (+9, -3) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+6, -0) (Diff)
/source/blender/makesdna/DNA_texture_types.h (+6, -1) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_cloth.c (+97, -1) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+33, -0) (Diff)
/source/blender/makesrna/intern/rna_particle.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+14, -0) (Diff)
/source/blender/modifiers/intern/MOD_cloth.c (+14, -0) (Diff)
/source/blender/render/intern/source/voxeldata.c (+10, -6) (Diff)
/source/blender/SConscript (+1, -0) (Diff)
/release/scripts/startup/bl_ui/properties_particle.py (+30, -0) (Diff)
/release/scripts/startup/bl_ui/properties_texture.py (+3, -0) (Diff)
/source/blender/blenkernel/BKE_cloth.h (+41, -15) (Diff)
/source/blender/blenkernel/BKE_collision.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_effect.h (+30, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+2, -2) (Diff)
/source/blender/blenkernel/intern/cloth.c (+72, -36) (Diff)
/source/blender/blenkernel/intern/collision.c (+608, -2) (Diff)
/source/blender/blenkernel/intern/effect.c (+153, -0) (Diff)
/source/blender/blenkernel/intern/particle.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+79, -18) (Diff)
/source/blender/blenkernel/SConscript (+1, -0) (Diff)
/source/blender/blenlib/BLI_math_matrix.h (+2, -1) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+10, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+12, -0) (Diff)
/source/blender/blenloader/intern/versioning_270.c (+19, -0) (Diff)
/source/blender/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/object/object_bake_api.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+6, -0) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_cloth_types.h (+9, -3) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+6, -0) (Diff)
/source/blender/makesdna/DNA_texture_types.h (+6, -1) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_cloth.c (+97, -1) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+33, -0) (Diff)
/source/blender/makesrna/intern/rna_particle.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+14, -0) (Diff)
/source/blender/modifiers/intern/MOD_cloth.c (+14, -0) (Diff)
/source/blender/render/intern/source/voxeldata.c (+10, -6) (Diff)
/source/blender/SConscript (+1, -0) (Diff)