[Bf-blender-cvs] [bbaf835] hair_system: Replaced previous HairDebugData with the new equivalent SimDebugData.

[Lukas Tönne]

Commit: bbaf835f49e85f25317bd2a003a6690243954cca
Author: Lukas Tönne
Date:   Wed Sep 24 12:39:10 2014 +0200
Branches: hair_system
https://developer.blender.org/rBbbaf835f49e85f25317bd2a003a6690243954cca

Replaced previous HairDebugData with the new equivalent SimDebugData.

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

M	source/blender/blenkernel/intern/object.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/modifiers/intern/MOD_hair.c

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index b83141d..abff0ab 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3188,7 +3188,7 @@ void BKE_object_sim_pre_step(Scene *scene, Object *ob, float ctime)
 			
 			if (!hmd->flag & MOD_HAIR_SOLVER_DATA_VALID) {
 				HAIR_solver_build_modifier_data(hmd->solver_data, scene, ob, dm, hsys, ctime);
-				BKE_hair_debug_data_clear(hmd->debug_data);
+				BKE_sim_debug_data_clear(hmd->debug_data);
 				hmd->flag |= MOD_HAIR_SOLVER_DATA_VALID;
 			}
 			
@@ -3207,7 +3207,7 @@ void BKE_object_sim_tick(Scene *UNUSED(scene), Object *ob, float ctime, float ti
 			
 			if (!(hmd->debug_flag & MOD_HAIR_DEBUG_SHOW)) {
 				if (hmd->debug_data) {
-					BKE_hair_debug_data_free(hmd->debug_data);
+					BKE_sim_debug_data_free(hmd->debug_data);
 					hmd->debug_data = NULL;
 				}
 				
@@ -3218,7 +3218,7 @@ void BKE_object_sim_tick(Scene *UNUSED(scene), Object *ob, float ctime, float ti
 				invert_m4_m4(imat, ob->obmat);
 				
 				if (!hmd->debug_data)
-					hmd->debug_data = BKE_hair_debug_data_new();
+					hmd->debug_data = BKE_sim_debug_data_new();
 				
 				HAIR_solver_step_debug(hmd->solver_data, ctime, timestep, imat, hmd->debug_data);
 			}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 791011e..923c2e9 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4883,6 +4883,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 				direct_link_hair_system(fd, hmd->hairsys);
 
 			hmd->solver_data = NULL;
+			hmd->debug_data = NULL;
 		}
 	}
 }
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index d8bb4e3..631cd03 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1377,7 +1377,8 @@ typedef struct HairModifierData {
 	ModifierData modifier;
 	
 	struct HairSystem *hairsys;
-	struct HairSolverData *solver_data;     /* runtime instance */
+	struct HairSolverData *solver_data;     /* runtime solver data */
+	struct SimDebugData *debug_data;        /* runtime solver debugging */
 	
 	int flag;
 
diff --git a/source/blender/modifiers/intern/MOD_hair.c b/source/blender/modifiers/intern/MOD_hair.c
index 31e9d7a..ed48725 100644
--- a/source/blender/modifiers/intern/MOD_hair.c
+++ b/source/blender/modifiers/intern/MOD_hair.c
@@ -36,6 +36,7 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_DerivedMesh.h"
+#include "BKE_effect.h"
 #include "BKE_hair.h"
 #include "BKE_modifier.h"
 #include "BKE_scene.h"
@@ -61,7 +62,7 @@ static void freeData(ModifierData *md)
 	
 	BKE_hairsys_free(hmd->hairsys);
 	
-	BKE_hair_debug_data_free(hmd->debug_data);
+	BKE_sim_debug_data_free(hmd->debug_data);
 }
 
 static void copyData(ModifierData *md, ModifierData *target)