[Bf-blender-cvs] [28f0ba1] temp_merge_gooseberry_hair: Fix for grid drawing in 3D view, was using one less grid cell.

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


Commit: 28f0ba18d03791df02da9ffd7c093eb72fc22a25
Author: Lukas Tönne
Date:   Mon Nov 10 11:34:36 2014 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB28f0ba18d03791df02da9ffd7c093eb72fc22a25

Fix for grid drawing in 3D view, was using one less grid cell.

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

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 3a51412..3e2c89d 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]-1; ++i) {
-						float f = interpf(b[0], a[0], (float)i / (float)(res[0]-1));
+					for (i = 1; i < res[0]; ++i) {
+						float f = interpf(b[0], a[0], (float)i / (float)(res[0]));
 						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]-1; ++i) {
-						float f = interpf(b[1], a[1], (float)i / (float)(res[1]-1));
+					for (i = 1; i < res[1]; ++i) {
+						float f = interpf(b[1], a[1], (float)i / (float)(res[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]-1; ++i) {
-						float f = interpf(b[2], a[2], (float)i / (float)(res[2]-1));
+					for (i = 1; i < res[2]; ++i) {
+						float f = interpf(b[2], a[2], (float)i / (float)(res[2]));
 						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