svn merge -r 13148:13177 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 9 Jan 2008 12:04:54 +0000 (12:04 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 9 Jan 2008 12:04:54 +0000 (12:04 +0000)
1  2 
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_object_force.h
source/blender/src/buttons_object.c
source/blender/src/drawobject.c
source/blender/src/editparticle.c
source/blender/src/toolbox.c

index 355cd19da3358a155dc66fdd1336c6fa23e51bac,744ccf2749197efce49b37312fb32f60439348dc..f8f2f0b9f57f89be09faa7bd60b63ce905c39ee9
@@@ -7,8 -7,8 +7,9 @@@ incs = '. #/intern/guardedalloc ../incl
  incs += ' ../python ../render/extern/include #/intern/decimation/extern'
  incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
  incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
 +incs += ' #/extern/bullet2/src'
  incs += ' #/intern/bmfont'
+ incs += ' #/intern/opennl/extern'
  
  incs += ' ' + env['BF_OPENGL_INC']
  incs += ' ' + env['BF_ZLIB_INC']
index 9a6a477bb47b195af37369f7b46850c1fd2c4102,0cee849940baa137852f600925b96c1bf3b4fd46..b0408f2f4d98cbe0fde18216f14f38ace0881876
@@@ -133,6 -134,9 +134,8 @@@ typedef struct SoftBody 
                ;   
  
        struct SBScratch *scratch;      /* scratch pad/cache on live time not saved in file */
 -
+       float shearstiff;
+       float inpush;
  } SoftBody;
  
  /* pd->forcefield:  Effector Fields types */
index 3883db39c74a3ead1618f0d1762e1440f83ad0e7,4ce57419b69e5d060d177a1ea8367e72c48e2a14..f1b75d075f3def4fe9dcc261d5ab670af72cdb1e
@@@ -3180,9 -3096,7 +3180,9 @@@ static void object_panel_deflection(Obj
        if(ob->pd && ob->type==OB_MESH) {
                PartDeflect *pd= ob->pd;
                
 -              uiDefButBitS(block, TOG, 1, B_REDR, "Deflection",160,160,150,20, &pd->deflect, 0, 0, 0, 0, "Deflects particles based on collision");
 +              but = uiDefButBitS(block, TOG, 1, B_REDR, "Deflection",160,160,150,20, &pd->deflect, 0, 0, 0, 0, "Deflects particles based on collision");
-               uiButSetFunc(but, object_collision__enabletoggle, ob, NULL);
++              // uiButSetFunc(but, object_collision__enabletoggle, ob, NULL);
 +              
                if(pd->deflect) {
                        uiDefBut(block, LABEL, 0, "Particles",                  160,140,75,20, NULL, 0.0, 0, 0, 0, "");
                        uiDefButBitS(block, TOG, PDEFLE_KILL_PART, B_DIFF, "Kill",235,140,75,20, &pd->flag, 0, 0, 0, 0, "Kill collided particles");
Simple merge
Simple merge
Simple merge