svn merge -r 12856:12937 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Tue, 18 Dec 2007 17:29:35 +0000 (17:29 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Tue, 18 Dec 2007 17:29:35 +0000 (17:29 +0000)
15 files changed:
1  2 
intern/elbeem/intern/isosurface.cpp
intern/elbeem/intern/solver_main.cpp
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/python/api2_2x/Draw.c
source/blender/python/api2_2x/Geometry.c
source/blender/python/api2_2x/Key.c
source/blender/python/api2_2x/Mesh.c
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
tools/btools.py

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index db86f14ad7652d44ae9f58f2b5e3a5f557cb4d96,83139fcfb0af3a3ea9a2aa194c4919008ec367f9..43e727f4e96d7a0ee0a3f9ad2880a9752735eaed
@@@ -1689,12 -1674,10 +1676,10 @@@ static void draw_modifier(uiBlock *bloc
                uiBlockBeginAlign(block);
                uiDefBut(block, TEX, B_MODIFIER_REDRAW, "", x+10, y-1, buttonWidth-60, 19, md->name, 0.0, sizeof(md->name)-1, 0.0, 0.0, "Modifier name"); 
  
 -                      /* Softbody not allowed in this situation, enforce! */
 -              if (md->type!=eModifierType_Softbody || !(ob->pd && ob->pd->deflect)) {
 +              /* Softbody not allowed in this situation, enforce! */
 +              if ((md->type!=eModifierType_Softbody && md->type!=eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) {
                        uiDefIconButBitI(block, TOG, eModifierMode_Render, B_MODIFIER_RECALC, ICON_SCENE, x+10+buttonWidth-60, y-1, 19, 19,&md->mode, 0, 0, 1, 0, "Enable modifier during rendering");
                        but= uiDefIconButBitI(block, TOG, eModifierMode_Realtime, B_MODIFIER_RECALC, VICON_VIEW3D, x+10+buttonWidth-40, y-1, 19, 19,&md->mode, 0, 0, 1, 0, "Enable modifier during interactive display");
-                       if (md->type==eModifierType_ParticleSystem)
-                               uiButSetFunc(but, modifiers_psysEnable, ob, md);
                        if (mti->flags&eModifierTypeFlag_SupportsEditmode) {
                                uiDefIconButBitI(block, TOG, eModifierMode_Editmode, B_MODIFIER_RECALC, VICON_EDIT, x+10+buttonWidth-20, y-1, 19, 19,&md->mode, 0, 0, 1, 0, "Enable modifier during Editmode (only if enabled for display)");
                        }
Simple merge
Simple merge
Simple merge
diff --cc tools/btools.py
Simple merge