[Bf-blender-cvs] [b30019f] gooseberry: Merge branch 'hair_immediate_fixes' into gooseberry

Lukas Tönne noreply at git.blender.org
Sat Nov 15 15:07:22 CET 2014


Commit: b30019fabe5a8c27cef1e551ed60b9e173c3fe9b
Author: Lukas Tönne
Date:   Sat Nov 15 15:07:06 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBb30019fabe5a8c27cef1e551ed60b9e173c3fe9b

Merge branch 'hair_immediate_fixes' into gooseberry

Conflicts:
	release/scripts/startup/bl_ui/properties_particle.py
	source/blender/editors/physics/particle_edit.c
	source/blender/makesdna/DNA_modifier_types.h
	source/blender/physics/intern/BPH_mass_spring.cpp
	source/blender/physics/intern/hair_volume.cpp
	source/blender/physics/intern/implicit.h
	source/blender/physics/intern/implicit_blender.c
	source/blender/physics/intern/implicit_eigen.cpp

===================================================================



===================================================================

diff --cc source/blender/physics/intern/BPH_mass_spring.cpp
index cc1f3d3,f8017a7..798dd45
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@@ -888,10 -870,13 +870,12 @@@ static void cloth_continuum_step(ClothM
  	hair_get_boundbox(clmd, gmin, gmax);
  	
  	/* gather velocities & density */
- 	if (smoothfac > 0.0f || pressfac > 0.0f) {
+ 	if (smoothfac > 0.0f || densfac > 0.0f) {
  		HairGrid *grid = BPH_hair_volume_create_vertex_grid(clmd->sim_parms->voxel_cell_size, gmin, gmax);
+ 		
  		BPH_hair_volume_set_debug_data(grid, clmd->debug_data);
+ 		BPH_hair_volume_set_debug_value(grid, parms->debug1, parms->debug2, parms->debug3, parms->debug4);
  		
 -//		BPH_hair_volume_set_debug_value(grid, (int)(spring2->ij == clmd->sim_parms->density_target));
  		cloth_continuum_fill_grid(grid, cloth);
  		
  		/* main hair continuum solver */




More information about the Bf-blender-cvs mailing list