[GRASS-SVN] r56530 - grass/branches/releasebranch_6_4/lib/ogsf

[svn_grass at osgeo.org]

Author: annakrat
Date: 2013-06-01 09:26:10 -0700 (Sat, 01 Jun 2013)
New Revision: 56530

Modified:
   grass/branches/releasebranch_6_4/lib/ogsf/gpd.c
Log:
ogsf: fix z shift of points (merge from trunk, r56515)

Modified: grass/branches/releasebranch_6_4/lib/ogsf/gpd.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/ogsf/gpd.c	2013-06-01 16:18:46 UTC (rev 56529)
+++ grass/branches/releasebranch_6_4/lib/ogsf/gpd.c	2013-06-01 16:26:10 UTC (rev 56530)
@@ -369,7 +369,6 @@
 
 	if (src == CONST_ATT) {
 	    konst = gs->att[ATT_TOPO].constant;
-	    site[Z] = konst;
 	}
 	else {
 	    buf = gs_get_att_typbuff(gs, ATT_TOPO, 0);
@@ -428,7 +427,7 @@
 	    }
 	    else if (src == CONST_ATT) {
 		if (gs_point_in_region(gs, site, NULL)) {
-		    site[Z] += gp->z_trans;
+		    site[Z] = konst + gp->z_trans;
 		    if (gsd_checkpoint
 			(site, window, viewport, modelMatrix, projMatrix))
 			continue;