[Bf-blender-cvs] [c0c435e] hair_system: Removed duplicate root drawing code, this is now in a separate debug function.

Lukas Tönne noreply at git.blender.org
Tue Aug 5 17:49:48 CEST 2014


Commit: c0c435ee7fd311074999600eba8e0751593a06c6
Author: Lukas Tönne
Date:   Tue Aug 5 16:59:16 2014 +0200
Branches: hair_system
https://developer.blender.org/rBc0c435ee7fd311074999600eba8e0751593a06c6

Removed duplicate root drawing code, this is now in a separate debug
function.

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

M	source/blender/editors/space_view3d/drawhair.c

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

diff --git a/source/blender/editors/space_view3d/drawhair.c b/source/blender/editors/space_view3d/drawhair.c
index 8f3b6e5..fbb9b86 100644
--- a/source/blender/editors/space_view3d/drawhair.c
+++ b/source/blender/editors/space_view3d/drawhair.c
@@ -88,7 +88,6 @@ bool draw_hair_system(Scene *UNUSED(scene), View3D *UNUSED(v3d), ARegion *ar, Ba
 {
 	RegionView3D *rv3d = ar->regiondata;
 	Object *ob = base->object;
-	struct DerivedMesh *dm = ob->derivedFinal;
 	HairCurve *hair;
 	int i;
 	bool retval = true;
@@ -96,22 +95,6 @@ bool draw_hair_system(Scene *UNUSED(scene), View3D *UNUSED(v3d), ARegion *ar, Ba
 	glLoadMatrixf(rv3d->viewmat);
 	glMultMatrixf(ob->obmat);
 	
-	/* hair roots */
-	if (dm) {
-		glPointSize(3.0f);
-		glColor3f(1.0f, 1.0f, 0.0f);
-		glBegin(GL_LINES);
-		for (hair = hsys->curves, i = 0; i < hsys->totcurves; ++hair, ++i) {
-			float loc[3], nor[3];
-			if (BKE_mesh_sample_eval(dm, &hair->root, loc, nor)) {
-				glVertex3f(loc[0], loc[1], loc[2]);
-				madd_v3_v3fl(loc, nor, 0.1f);
-				glVertex3f(loc[0], loc[1], loc[2]);
-			}
-		}
-		glEnd();
-	}
-	
 	for (hair = hsys->curves, i = 0; i < hsys->totcurves; ++hair, ++i) {
 		draw_hair_curve(hsys, hair);
 	}




More information about the Bf-blender-cvs mailing list