svn merge -r 12716:12856 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 12 Dec 2007 17:58:06 +0000 (17:58 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 12 Dec 2007 17:58:06 +0000 (17:58 +0000)
14 files changed:
1  2 
CMakeLists.txt
intern/elbeem/intern/isosurface.cpp
intern/elbeem/intern/solver_main.cpp
source/Makefile
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/include/butspace.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/editobject.c
source/blender/src/editparticle.c
source/blender/src/transform_conversions.c

diff --cc CMakeLists.txt
index eabcdde1dde6ab84b8a6b08c361b6cd4f3ba8bcf,0227c51f39d17a3ff8fbc28324e14e4af3805016..d79c22201045b83c6138051293702982028dcbb1
@@@ -1,4 -1,4 +1,4 @@@
--# $Id$
++# $Id: CMakeLists.txt 12480 2007-11-05 16:46:48Z sirdude $
  # ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  #
  # This program is free software; you can redistribute it and/or
Simple merge
Simple merge
diff --cc source/Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index c9cf745fa441e7c30373f60a5738c2b5ef7936da,a2823a0855b15c4355df56a209684f0ef55ab0d7..411a45d0a538875326123e664fb69be681cb476e
@@@ -596,11 -600,11 +600,11 @@@ static void PE_mirror_particle(Object *
        edit= psys->edit;
        i= pa - psys->particles;
  
++      if(!edit->mirror_cache)
++              PE_update_mirror_cache(ob, psys);
++
        /* find mirrored particle if needed */
        if(!mpa) {
--              if(!edit->mirror_cache)
--                      PE_update_mirror_cache(ob, psys);
--
                mi= edit->mirror_cache[i];
                if(mi == -1)
                        return;