[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10772] branches/bmesh/source/blender/src/ drawobject.c: BMesh Branch

Joseph Eagar joeedh at gmail.com
Thu May 24 05:36:40 CEST 2007


Revision: 10772
          https://svn.blender.org//revision/?rev=10772&view=rev
Author:   joeedh
Date:     2007-05-24 05:36:40 +0200 (Thu, 24 May 2007)

Log Message:
-----------
BMesh Branch

Stupid error in last commit.  Also, I'm thinking theres
not much point to making wiki-compatible commit logs.

Modified Paths:
--------------
    branches/bmesh/source/blender/src/drawobject.c

Modified: branches/bmesh/source/blender/src/drawobject.c
===================================================================
--- branches/bmesh/source/blender/src/drawobject.c	2007-05-24 03:21:03 UTC (rev 10771)
+++ branches/bmesh/source/blender/src/drawobject.c	2007-05-24 03:36:40 UTC (rev 10772)
@@ -1902,6 +1902,7 @@
 {
 	bglCacheMesh *self = (bglCacheMesh*) vself;
 	bglTriangle *tri;
+
 	CACHEERROR_CHECK
 
 	if (mat < 0 || mat >= self->totmat) {
@@ -1927,11 +1928,13 @@
 {
 	bglCacheMesh *self = (bglCacheMesh*) vself;
 	bglEdgeWire *ewire;
+
 	CACHEERROR_CHECK
 
 	ewire = BLI_memarena_alloc(self->arena, sizeof(*ewire));
 	VECCOPY(ewire->v1, v1);
 	VECCOPY(ewire->v2, v2);
+
 	if (c1) VECCOPY(ewire->c2, c2);
 
 	if (c2) {
@@ -1948,6 +1951,7 @@
 {
 	bglCacheMesh *self = (bglCacheMesh*) vself;
 	bglVertPoint *point;
+
 	CACHEERROR_CHECK
 
 	point = BLI_memarena_alloc(self->arena, sizeof(*point));
@@ -2003,12 +2007,12 @@
 
 	if (self->totwire) {
 		self->wireverts = BLI_memarena_alloc(self->gl_arena, sizeof(float)*3*2*self->totwire);
-		self->wireverts = BLI_memarena_alloc(self->gl_arena, 3*2*self->totwire);
+		self->wirecols = BLI_memarena_alloc(self->gl_arena, 3*2*self->totwire);
 		for (wire=self->wires.first, i=0; wire; i++, wire=wire->next) {
 			VECCOPY(self->wireverts+i*3*2, wire->v1);
 			VECCOPY(self->wireverts+i*3*2+3, wire->v2);
-			VECCOPY(self->wireverts+i*3*2, wire->v1);
-			VECCOPY(self->wireverts+i*3*2+3, wire->v2);
+			VECCOPY(self->wirecols+i*3*2, wire->c1);
+			VECCOPY(self->wirecols+i*3*2+3, wire->c2);
 		}
 	}
 





More information about the Bf-blender-cvs mailing list