[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58962] trunk/blender/source/blender/ editors/space_view3d/view3d_draw.c: view3d: gridfloor subdivisions wasn' t respected for perspective mode.
Campbell Barton
ideasman42 at gmail.com
Tue Aug 6 09:10:18 CEST 2013
Revision: 58962
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58962
Author: campbellbarton
Date: 2013-08-06 07:10:18 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
view3d: gridfloor subdivisions wasn't respected for perspective mode.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-08-06 06:38:52 UTC (rev 58961)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-08-06 07:10:18 UTC (rev 58962)
@@ -350,18 +350,19 @@
}
}
else {
- short sublines = v3d->gridsubdiv;
+ const double sublines = v3d->gridsubdiv;
+ const float sublines_fl = v3d->gridsubdiv;
if (dx < GRID_MIN_PX_D) {
- rv3d->gridview *= sublines;
+ rv3d->gridview *= sublines_fl;
dx *= sublines;
if (dx < GRID_MIN_PX_D) {
- rv3d->gridview *= sublines;
+ rv3d->gridview *= sublines_fl;
dx *= sublines;
if (dx < GRID_MIN_PX_D) {
- rv3d->gridview *= sublines;
+ rv3d->gridview *= sublines_fl;
dx *= sublines;
if (dx < GRID_MIN_PX_D) {
/* pass */
@@ -389,10 +390,10 @@
}
else {
if (dx > (GRID_MIN_PX_D * 10.0)) { /* start blending in */
- rv3d->gridview /= sublines;
+ rv3d->gridview /= sublines_fl;
dx /= sublines;
if (dx > (GRID_MIN_PX_D * 10.0)) { /* start blending in */
- rv3d->gridview /= sublines;
+ rv3d->gridview /= sublines_fl;
dx /= sublines;
if (dx > (GRID_MIN_PX_D * 10.0)) {
UI_ThemeColor(TH_GRID);
@@ -494,6 +495,7 @@
/* draw the Y axis and/or grid lines */
if (v3d->gridflag & V3D_SHOW_FLOOR) {
+ const int sublines = v3d->gridsubdiv;
float vert[4][3] = {{0.0f}};
unsigned char col_bg[3];
unsigned char col_grid_emphasise[3], col_grid_light[3];
@@ -517,7 +519,7 @@
for (a = -gridlines; a <= gridlines; a++) {
const float line = a * grid_scale;
- const int is_emphasise = (a % 10) == 0;
+ const int is_emphasise = (a % sublines) == 0;
if (is_emphasise != prev_emphasise) {
glColor3ubv(is_emphasise ? col_grid_emphasise : col_grid_light);
More information about the Bf-blender-cvs
mailing list