bdfe7d89e2
Merge of trunk into blender 2.5:
...
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416
Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
later added in trunk also, but reverted partially, specifically revision
16683. I have left out this reversion in the 2.5 branch since I think it is
needed there.
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
-W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
differently. Since this is changed so much, and I don't think those fixes
would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
initialized when running with -P. The code that initializes the screen there
I had to disable, that can't work in 2.5 anymore but left it commented as a
reminder.
Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.
Still to be done:
* Go over files and functions that were moved to a different location but could
still use changes that were done in trunk.
2008-11-12 21:16:53 +00:00
e1aff849e4
Collisions: CollisionModifier needs to be resetted for every loop
2008-10-14 11:54:07 +00:00
af7b777d22
Bugfix for regression from 2.46 on cloth collisions reported by Daniel Salazar via IRC
2008-10-14 11:50:30 +00:00
3996b82b50
[ #17707 ] Slow Cloth Baking
2008-09-29 14:20:27 +00:00
8562efe8a3
a) Forces can be hidden by deflector object now (need to talk with jahka about particle integration - should be copy-paste) see http://dldw.de/tmp/index.php?file=w2.blend (press play button in timeline and change the absorption value ob the cube) b) fixed deflector/collision bug with continues physics c) cloth wind/forces uses masses now d) even faster collision object gathering e) have fun ;)
2008-08-18 14:41:24 +00:00
1d49ed89cb
Bugfix for non working selfcollisions [no 2.47 bugfix]
2008-08-03 01:41:57 +00:00
ad2be5f64f
Bugfix for weird + in the code, no idea why it compiled (yet some selfcollision bug to fix) [no 2.47 fix]
2008-08-03 01:00:51 +00:00
039814f7d2
No long needed here (win64 cleanup)
2008-07-29 18:07:06 +00:00
e0fc591697
Fix for crash in collisions (introduced *after* 2.46 with my collision recode)
2008-07-20 21:05:48 +00:00
8ca128414d
Cloth collisions: Reorganized collision system to be more flexible for other parts of blender, so it can be more easily reused. Also slowed down friction impulse.
2008-07-02 20:28:49 +00:00
fcdbd76625
Collisions: enabling self collision quality setting again (request by Nudel)
2008-06-05 11:08:51 +00:00
3d51c59034
Bugfix for exploding cloth collisions
2008-06-05 10:52:52 +00:00
0c0c43f620
Collision commit code cleanup for nicer compile
2008-06-03 19:06:54 +00:00
f1d54f892b
-= Collisions =-
...
Getting some weird results on moving fast edges. This is a backup commit, will try another thing
2008-05-29 14:23:08 +00:00
ed42c9a676
-= Collisions -=
...
1. Test for fast moving edges
2008-05-27 22:46:57 +00:00
391c7615d1
-= Collisions =-
...
1. fix for collisions (were working better with selfcolls enabled, now generally better)
2008-05-26 10:36:14 +00:00
cb378cbceb
-= Cloth =-
...
1. Fix selfcollisions (reported by nudelZ)
2008-05-26 09:39:32 +00:00
4bf01e8162
Commit of selfcollisions using new kdop design. Should result in nice speedup.
2008-05-23 20:20:14 +00:00
4d8b5587b8
Pre merge commit (includes commented moving stuff)
2008-05-14 16:09:56 +00:00
db3712a2d8
svn merge -r 14721:14810 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-05-12 12:24:52 +00:00
a68c03e409
Reason of all this work: Commiting my work-in-progress on reviewed collision system (better + general access to kdop, uses less memory, put it into BLI_* namespace and usage defined like existing BLI_kdtree_*). Deleted old kdop.c
2008-05-07 20:42:16 +00:00
ff26d59577
WITH_BULLET wasn't working for Makefiles.
...
I changed it so its tests are more inline with other defines.
Jesterking said this shouldn't affect scons so yell at him if it does. ;)
Kent
2008-04-22 19:14:33 +00:00
Chris Want
5d0a207ecb
Patch from GSR that a) fixes a whole bunch of GPL/BL license
...
blocks that were previously missed; and b) greatly increase my
ohloh stats!
2008-04-16 22:40:48 +00:00
fef157ac07
Cloth bugfix: used old dm instead of new created result derivedmesh; Code cleanup + deactivation of unsued selfcollision code in kdop.c + little speedup there
2008-04-08 12:55:35 +00:00
6111ad6551
Collision commit was messed up - reported by Mr. Barton :)
2008-03-20 20:28:51 +00:00
af8c68ddc4
Cloth structure names update: Sorry about this commit, it will kill all your cloth settings in old files but I had to do it before release because naming convention was really bad in cloth (e.g. using SimulationSettings instead of ClothSimSettings in DNA). Same for some structure in CollisionModifier but with no sideeffects.
2008-03-20 18:28:40 +00:00
9362772ffd
Collision modifier: Update from mvert was using only static update, now uses dynamic update and catches therefore also faster movements - reported by nudelZ (#blendercoders)
2008-03-20 18:16:11 +00:00
7c1a21c385
Collision Modifier/KDOP: Rearrange things to be more generic. Also fix possible crash if not enough memory there.
2008-03-17 21:45:40 +00:00
df27557b81
Cloth header cleanup, bugfix (again) in wind calculation, bugfix for not working fields mindist GUI option
2008-03-13 22:45:36 +00:00
3ebcb39090
Cloth bugfix for jumpy cloth (users were complaining), so the mass can be changed on GUI now (reference: in old blendfiles, mass=1.0 was used)
2008-03-06 01:21:40 +00:00
156d246462
Cloth bugfix for linked deflector groups (reported by alchibal on #blendercoders incl. source) - please verify
2008-03-03 19:02:01 +00:00
6169b29b3a
Cloth: Bugfix for wrong calculated bending springs, Bugfix for selfcollisions (faster + bugfix for explode), Changed: Collision response also put vertices back to surface now
2008-02-28 23:12:50 +00:00
905a2d374a
Cloth: 1. Bugfix for possible memory leak reported by Kenneth Styrberg (via mailing list), 2. Bugfix for friction again, 3. Preset menu on GUI (thanks to help from nudelZ (#blendercoders), 4. Possibility to disable autoprotect cache, 5. Some cache bugs fixed, 6. Some speedup in generating cloth
2008-02-28 00:01:19 +00:00
7d310f4e5c
Cloth: fixed completely useless/wrong friction force; changed some initial settings
2008-02-27 03:23:17 +00:00
824a714b47
Purge of compiler warnings... (hopefully everything still compiles, there are still more to remove)
2008-02-24 11:16:37 +00:00
3192263367
Cloth: changes in editmode will influence the velocity by 10% now, changed/add some update calls for the implicit function
2008-02-13 10:44:36 +00:00
a21c765f4b
Cloth: Fix order in collision loop -> solving selfcollision could result in new cloth-object collisions, adjust 'collision quality' for the number of loops taken
2008-02-12 12:02:39 +00:00
e82484b0bb
Cloth: New: *simple* (OpenMP enabled) Selfcollisions available
2008-02-12 11:04:58 +00:00
69e6a6cbc9
Pointcache: Fixed non-availability when blend file was loaded from command line and also another case where you startet from an unsaved blend and switched to a saved one; Cloth: Fixid mass init, little speedup for collisions; Collision Modifier: More generalized it
2008-02-11 13:30:52 +00:00
a8c25e279d
Cloth: Fix for crash with meshes with no faces, 2. Fix for crash on switching from to another mesh
2008-02-05 15:09:48 +00:00
7a70e5c0c0
Cloth: 1. Fix for deflection being enabled thourgh softbody interface, 2. Fix for wrong calculated friction, 3. Fix for some header which was accitently blown up by my editor
2008-02-05 14:11:48 +00:00
0e7bdb959e
Cloth: Fixed: [ #8210 ] (includes bad spring calculation), only mesh can get cloth assigned, New: initial try of Bridson/Fedkiw friction formula implementation, better GUI feedback when e.g. cache is protected and settings too
2008-02-03 22:37:43 +00:00
2a3e93444a
Replaced all *f geometric functions like sinf etc. with sin etc. (were used in 2 functions from the gnu scientific library)
2008-01-31 12:29:57 +00:00
7a7a52226f
makes bullet independant from gameengine for cmake, introduces esc-key during sim, disables collisions when no bullet there
2008-01-29 23:13:31 +00:00
77685023ca
Initial commit of cloth modifier from branch rev 13453
2008-01-29 21:01:12 +00:00
