[Bf-blender-cvs] [b6623ab] temp_merge_gooseberry_hair: Debug grid drawing for hair volume was drawing one subdivision too many.

Lukas Tönne noreply at git.blender.org
Mon Jan 19 20:50:31 CET 2015


Commit: b6623abfcc1e0836b0ba880e67705aa286c8d3fd
Author: Lukas Tönne
Date:   Wed Nov 5 17:25:50 2014 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rBb6623abfcc1e0836b0ba880e67705aa286c8d3fd

Debug grid drawing for hair volume was drawing one subdivision too many.

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

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

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

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 1841515..3a51412 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5226,22 +5226,22 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 						UI_ThemeColorShadeAlpha(TH_WIRE, 0, -100);
 					glEnable(GL_BLEND);
 					glBegin(GL_LINES);
-					for (i = 1; i < res[0]; ++i) {
-						float f = interpf(b[0], a[0], (float)i / (float)res[0]);
+					for (i = 1; i < res[0]-1; ++i) {
+						float f = interpf(b[0], a[0], (float)i / (float)(res[0]-1));
 						glVertex3f(f, a[1], a[2]); glVertex3f(f, b[1], a[2]);
 						glVertex3f(f, b[1], a[2]); glVertex3f(f, b[1], b[2]);
 						glVertex3f(f, b[1], b[2]); glVertex3f(f, a[1], b[2]);
 						glVertex3f(f, a[1], b[2]); glVertex3f(f, a[1], a[2]);
 					}
-					for (i = 1; i < res[1]; ++i) {
-						float f = interpf(b[1], a[1], (float)i / (float)res[1]);
+					for (i = 1; i < res[1]-1; ++i) {
+						float f = interpf(b[1], a[1], (float)i / (float)(res[1]-1));
 						glVertex3f(a[0], f, a[2]); glVertex3f(b[0], f, a[2]);
 						glVertex3f(b[0], f, a[2]); glVertex3f(b[0], f, b[2]);
 						glVertex3f(b[0], f, b[2]); glVertex3f(a[0], f, b[2]);
 						glVertex3f(a[0], f, b[2]); glVertex3f(a[0], f, a[2]);
 					}
-					for (i = 1; i < res[2]; ++i) {
-						float f = interpf(b[2], a[2], (float)i / (float)res[2]);
+					for (i = 1; i < res[2]-1; ++i) {
+						float f = interpf(b[2], a[2], (float)i / (float)(res[2]-1));
 						glVertex3f(a[0], a[1], f); glVertex3f(b[0], a[1], f);
 						glVertex3f(b[0], a[1], f); glVertex3f(b[0], b[1], f);
 						glVertex3f(b[0], b[1], f); glVertex3f(a[0], b[1], f);




More information about the Bf-blender-cvs mailing list