[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37108] branches/soc-2011-onion/source/ blender/gpu/intern/gpu_buffers.c: Revision: 29263
Jason Wilkins
Jason.A.Wilkins at gmail.com
Fri Jun 3 01:07:31 CEST 2011
Revision: 37108
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37108
Author: jwilkins
Date: 2011-06-02 23:07:30 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
Revision: 29263
Author: nicholasbishop
Date: 1:30:22 AM, Sunday, June 06, 2010
Message:
* Fixed bug in the buffer VBO code; no reading from a buffer mapped as GL_WRITE_ONLY.
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/gpu/intern/gpu_buffers.c
Modified: branches/soc-2011-onion/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- branches/soc-2011-onion/source/blender/gpu/intern/gpu_buffers.c 2011-06-02 22:52:20 UTC (rev 37107)
+++ branches/soc-2011-onion/source/blender/gpu/intern/gpu_buffers.c 2011-06-02 23:07:30 UTC (rev 37108)
@@ -575,11 +575,13 @@
that is what opengl will use */
for(j = 0; j < gridsize-1; ++j) {
for(k = 0; k < gridsize-1; ++k) {
- normal_quad_v3(vert_data[(j+1)*gridsize + (k+1)].no,
- vert_data[(j+1)*gridsize + k].co,
- vert_data[(j+1)*gridsize + k+1].co,
- vert_data[j*gridsize + k+1].co,
- vert_data[j*gridsize + k].co);
+ float norm[3];
+ normal_quad_v3(norm,
+ grid[(j+1)*gridsize + k].co,
+ grid[(j+1)*gridsize + k+1].co,
+ grid[j*gridsize + k+1].co,
+ grid[j*gridsize + k].co);
+ copy_v3_v3(vert_data[(j+1)*gridsize + (k+1)].no, norm);
}
}
}
More information about the Bf-blender-cvs
mailing list