[Bf-blender-cvs] [9cafd3a] strand_editmode: SimDebugData is now global, for easier usage and less intrusive code.

[Lukas Tönne]

Commit: 9cafd3ae564523c984a7a5201ed6fd2c671bc37f
Author: Lukas Tönne
Date:   Mon Apr 20 12:58:16 2015 +0200
Branches: strand_editmode
https://developer.blender.org/rB9cafd3ae564523c984a7a5201ed6fd2c671bc37f

SimDebugData is now global, for easier usage and less intrusive code.

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

M	source/blender/blenkernel/intern/editstrands.c
M	source/blender/editors/hair/hair_stroke.c
M	source/blender/editors/space_view3d/drawstrands.c
M	source/blender/makesrna/intern/rna_sculpt_paint.c
M	source/blender/physics/intern/strands.cpp

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

diff --git a/source/blender/blenkernel/intern/editstrands.c b/source/blender/blenkernel/intern/editstrands.c
index 777c8bd..5dc0402 100644
--- a/source/blender/blenkernel/intern/editstrands.c
+++ b/source/blender/blenkernel/intern/editstrands.c
@@ -69,7 +69,6 @@ BMEditStrands *BKE_editstrands_copy(BMEditStrands *es)
 	
 	es_copy->bm = BM_mesh_copy(es->bm);
 	es_copy->root_dm = CDDM_copy(es->root_dm);
-	es_copy->debug_data = NULL;
 	
 	return es_copy;
 }
@@ -101,8 +100,6 @@ void BKE_editstrands_free(BMEditStrands *es)
 		BM_mesh_free(es->bm);
 	if (es->root_dm)
 		es->root_dm->release(es->root_dm);
-	if (es->debug_data)
-		BKE_sim_debug_data_free(es->debug_data);
 }
 
 /* === constraints === */
diff --git a/source/blender/editors/hair/hair_stroke.c b/source/blender/editors/hair/hair_stroke.c
index 7dbd7e5..45fa281 100644
--- a/source/blender/editors/hair/hair_stroke.c
+++ b/source/blender/editors/hair/hair_stroke.c
@@ -343,7 +343,6 @@ static void hair_edge_comb(HairToolData *data, void *userdata, BMVert *v1, BMVer
 	float effect;
 	
 	strokelen = normalize_v3_v3(strokedir, data->delta);
-	BKE_sim_debug_data_add_vector(data->edit->debug_data, v1->co, strokedir, 1,0,0, "comb", 12345, BM_elem_index_get(v1));
 	
 	sub_v3_v3v3(edge, v2->co, v1->co);
 	edgelen = normalize_v3_v3(edgedir, edge);
@@ -358,7 +357,6 @@ static void hair_edge_comb(HairToolData *data, void *userdata, BMVert *v1, BMVer
 	mul_v3_v3fl(edge_proj, strokedir, edgelen);
 	
 	interp_v3_v3v3(edge, edge, edge_proj, combfactor * effect);
-	BKE_sim_debug_data_add_vector(data->edit->debug_data, v1->co, edge, 1,1,0, "comb", 3, BM_elem_index_get(v1));
 	
 	add_v3_v3v3(v2->co, v1->co, edge);
 }
diff --git a/source/blender/editors/space_view3d/drawstrands.c b/source/blender/editors/space_view3d/drawstrands.c
index dc7c9a3..8e36f4b 100644
--- a/source/blender/editors/space_view3d/drawstrands.c
+++ b/source/blender/editors/space_view3d/drawstrands.c
@@ -376,10 +376,4 @@ void draw_strands_edit_hair(Scene *scene, View3D *v3d, ARegion *ar, BMEditStrand
 	unbind_gpu_buffers_dots();
 	
 	restore_opengl_state(&info);
-	
-	/* debugging */
-	if (edit->debug_data) {
-		Base *base = BASACT;
-		draw_sim_debug_data(scene, v3d, ar, base, edit->debug_data);
-	}
 }
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 48e2755..d458e48 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -379,29 +379,6 @@ static void rna_HairEdit_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *U
 		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 }
 
-static void rna_HairEdit_show_debug_data_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-{
-	HairEditSettings *settings = ptr->data;
-	Object *ob = OBACT;
-	
-	if (ob) {
-		BMEditStrands *edit = BKE_editstrands_from_object(ob);
-		if (edit) {
-			if (edit->debug_data) {
-				/* always free debug data, that way resetting acts as a forced clear */
-				BKE_sim_debug_data_free(edit->debug_data);
-				edit->debug_data = NULL;
-			}
-			
-			if (settings->flag & HAIR_EDIT_SHOW_DEBUG) {
-				edit->debug_data = BKE_sim_debug_data_new();
-			}
-		}
-	}
-	
-	rna_HairEdit_update(bmain, scene, ptr);
-}
-
 static void rna_HairEdit_brush_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
 	HairEditSettings *settings = ptr->data;
@@ -999,11 +976,6 @@ static void rna_def_hair_edit(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Shape Object", "Outer shape to use for tools");
 	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_HairEdit_update");
-
-	prop = RNA_def_property(srna, "show_debug_data", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", HAIR_EDIT_SHOW_DEBUG);
-	RNA_def_property_ui_text(prop, "Show Debug Data", "");
-	RNA_def_property_update(prop, 0, "rna_HairEdit_show_debug_data_update");
 }
 
 void RNA_def_sculpt_paint(BlenderRNA *brna)
diff --git a/source/blender/physics/intern/strands.cpp b/source/blender/physics/intern/strands.cpp
index 11e729c..4a5c48e 100644
--- a/source/blender/physics/intern/strands.cpp
+++ b/source/blender/physics/intern/strands.cpp
@@ -241,9 +241,9 @@ static void calc_jacobian_entry(Object *ob, BMEditStrands *edit, IKTarget *targe
 		mul_v3_m4v3(wco, obmat, point);
 		
 		mul_v3_m4v3(wdir, obmat, jac1);
-		BKE_sim_debug_data_add_vector(edit->debug_data, wco, wdir, 1,1,0, "strands", index_angle, 1);
+		BKE_sim_debug_data_add_vector(wco, wdir, 1,1,0, "strands", index_angle, 1);
 		mul_v3_m4v3(wdir, obmat, jac2);
-		BKE_sim_debug_data_add_vector(edit->debug_data, wco, wdir, 0,1,1, "strands", index_angle + 1, 2);
+		BKE_sim_debug_data_add_vector(wco, wdir, 0,1,1, "strands", index_angle + 1, 2);
 	}
 #endif
 }
@@ -402,7 +402,7 @@ static void strands_solve_inverse_kinematics(Object *ob, BMEditStrands *edit, fl
 			
 			BM_ITER_STRANDS_ELEM_INDEX(v, &iter_strand, root, BM_VERTS_OF_STRAND, k) {
 				mul_v3_m4v3(wco, ob->obmat, &solution.coeff(3*k));
-				BKE_sim_debug_data_add_circle(edit->debug_data, wco, 0.05f, 1,0,1, "strands", k, BM_elem_index_get(root), 2344);
+				BKE_sim_debug_data_add_circle(wco, 0.05f, 1,0,1, "strands", k, BM_elem_index_get(root), 2344);
 			}
 		}
 #endif