svn merge -r 13357:13382 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Thu, 24 Jan 2008 10:53:16 +0000 (10:53 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Thu, 24 Jan 2008 10:53:16 +0000 (10:53 +0000)
1  2 
SConstruct
source/blender/blenkernel/intern/modifier.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/transform_conversions.c

diff --cc SConstruct
Simple merge
Simple merge
index a064e266d6d8c15aa2394f5e9ee80f9f91983ab5,1e90c623498e25bf1f4b314e8af7d2a0d328bc60..0b30f0b3cbaa846acf8600ad6126faa12a21d3a6
@@@ -5149,9 -4973,8 +5262,10 @@@ void physics_panels(
                        object_panel_deflection(ob);
                object_panel_fields(ob);
                object_softbodies(ob);
-               object_softbodies_II(ob);
+               object_softbodies_collision(ob);
+               object_softbodies_solver(ob);
 +              object_panel_cloth(ob);
 +              object_panel_cloth_II(ob);
                object_panel_fluidsim(ob);
        }
  }