[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43037] trunk/blender/source/blender: Fix [#29728] Explode Modifier Causes Crash.
Bastien Montagne
montagne29 at wanadoo.fr
Sat Dec 31 16:10:43 CET 2011
Revision: 43037
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43037
Author: mont29
Date: 2011-12-31 15:10:38 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
Fix [#29728] Explode Modifier Causes Crash.
The problem was in fact in recent BLI_edgehash changes: a typo in the new macro EDGE_ORD made v0 > v1, instead of v0 < v1. This caused the bug in explode modifier, which (ab)uses that ordering feature a bit?\226?\128?\166
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/edgehash.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
Modified: trunk/blender/source/blender/blenlib/intern/edgehash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/edgehash.c 2011-12-31 12:58:03 UTC (rev 43036)
+++ trunk/blender/source/blender/blenlib/intern/edgehash.c 2011-12-31 15:10:38 UTC (rev 43037)
@@ -52,7 +52,7 @@
/* ensure v0 is smaller */
#define EDGE_ORD(v0, v1) \
- if (v0 < v1) { \
+ if (v0 > v1) { \
v0 ^= v1; \
v1 ^= v0; \
v0 ^= v1; \
Modified: trunk/blender/source/blender/modifiers/intern/MOD_explode.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2011-12-31 12:58:03 UTC (rev 43036)
+++ trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2011-12-31 15:10:38 UTC (rev 43037)
@@ -790,8 +790,8 @@
/* float timestep; */
int *facepa=emd->facepa;
int totdup=0,totvert=0,totface=0,totpart=0;
- int i, v, mindex=0;
- unsigned int ed_v1, ed_v2;
+ int i, v;
+ unsigned int ed_v1, ed_v2, mindex=0;
MTFace *mtface = NULL, *mtf;
totface= dm->getNumFaces(dm);
More information about the Bf-blender-cvs
mailing list