[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31929] branches/soc-2010-nicolasbishop/ source/blender/gpu/intern/gpu_buffers.c: == Multires ==

Nicholas Bishop nicholasbishop at gmail.com
Wed Sep 15 01:41:12 CEST 2010


Revision: 31929
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31929
Author:   nicholasbishop
Date:     2010-09-15 01:41:11 +0200 (Wed, 15 Sep 2010)

Log Message:
-----------
== Multires ==

Fixed a crash when drawing without ptex

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_buffers.c

Modified: branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_buffers.c	2010-09-14 23:37:58 UTC (rev 31928)
+++ branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_buffers.c	2010-09-14 23:41:11 UTC (rev 31929)
@@ -1119,7 +1119,7 @@
 	GridKey *gridkey;
 	int *grid_indices, totgrid, gridsize;
 	CustomData *vdata = NULL, *fdata = NULL;
-	MPtex *mptex;
+	MPtex *mptex = NULL;
 	int mcol_first_layer, pmask_first_layer;
 	int i, use_grids, use_color, use_ptex, ptex_edit = 0;
 
@@ -1166,13 +1166,18 @@
 		for(i = 0; i < totgrid; ++i) {
 			DMGridData *grid = grids[grid_indices[i]];
 			GridToFace *gtf = &grid_face_map[grid_indices[i]];
-			MPtex *pt = &mptex[gtf->face];
-			MPtexSubface *subface = &pt->subfaces[gtf->offset];
+			MPtex *pt;
+			MPtexSubface *subface;
 			float u, v, ustep, vstep, vstart = 0;
 
-			if(subface->flag & MPTEX_SUBFACE_HIDDEN)
-				continue;
+			if(mptex) {
+				pt = &mptex[gtf->face];
+				subface = &pt->subfaces[gtf->offset];
 
+				if(subface->flag & MPTEX_SUBFACE_HIDDEN)
+					continue;
+			}
+
 			if(ptex_edit) {
 				ustep = subface->res[0] >> 1;
 				vstep = subface->res[1] >> 1;





More information about the Bf-blender-cvs mailing list