[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31282] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: Fix #23281: crash with multiresolution and uv project.
Brecht Van Lommel
brecht at blender.org
Thu Aug 12 12:35:34 CEST 2010
Revision: 31282
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31282
Author: blendix
Date: 2010-08-12 12:35:34 +0200 (Thu, 12 Aug 2010)
Log Message:
-----------
Fix #23281: crash with multiresolution and uv project.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2010-08-12 10:17:21 UTC (rev 31281)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2010-08-12 10:35:34 UTC (rev 31282)
@@ -69,6 +69,8 @@
static int ccgDM_getEdgeMapIndex(CCGSubSurf *ss, CCGEdge *e);
static int ccgDM_getFaceMapIndex(CCGSubSurf *ss, CCGFace *f);
+static int ccgDM_use_grid_pbvh(CCGDerivedMesh *ccgdm);
+
///
static void *arena_alloc(CCGAllocatorHDL a, int numBytes) {
@@ -1249,7 +1251,7 @@
static void ccgdm_pbvh_update(CCGDerivedMesh *ccgdm)
{
- if(ccgdm->pbvh && ccgdm->multires.mmd) {
+ if(ccgdm->pbvh && ccgDM_use_grid_pbvh(ccgdm)) {
CCGFace **faces;
int totface;
More information about the Bf-blender-cvs
mailing list