svn merge ^/trunk/blender -r43033:43062
authorCampbell Barton <ideasman42@gmail.com>
Mon, 2 Jan 2012 02:57:36 +0000 (02:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 2 Jan 2012 02:57:36 +0000 (02:57 +0000)
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/bvhutils.c
source/blender/makesrna/RNA_access.h
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_remesh.c

diff --cc CMakeLists.txt
Simple merge
Simple merge
index cc017738bd0063458812c8aed32f37cd0b4fdd07,b18be28ac7f2c701ee73fea90c7d2fd059741f5f..6b75f678c36f6f0bb4aa64f076ec823b12c1b2c1
@@@ -798,13 -790,13 +798,13 @@@ static DerivedMesh * explodeMesh(Explod
        /* 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);
 +      totface= dm->getNumTessFaces(dm);
        totvert= dm->getNumVerts(dm);
 -      mface= dm->getFaceArray(dm);
 +      mface= dm->getTessFaceArray(dm);
        totpart= psmd->psys->totpart;
  
        sim.scene= scene;