31d2ee9bf7
style cleanup, brackets in else/if, some indentation.
2012-03-06 18:40:15 +00:00
95670e03a0
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
47c373c7a9
style cleanup (mostly whitespace)
2012-02-27 10:35:39 +00:00
22a1ad61f9
svn merge ^/trunk/blender -r42372:42416
2011-12-04 18:39:19 +00:00
f4eb0f507f
#if 0 use of Object.nlastrips, there is no way to add or remove these from blender so better not run.
2011-12-04 17:24:34 +00:00
7508540c53
svn merge -r41575:41602 ^/trunk/blender
2011-11-07 07:01:24 +00:00
d8717d2628
more macro --> bli math lib replacements.
2011-11-06 15:39:20 +00:00
bd86ba2c88
svn merge -r41335:41371
2011-10-30 01:27:49 +00:00
f837b46a2b
Modifier compilation tweaks (Blender conference commit)
...
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake)
* Use WITH_BF_FLUID in your user config (scons)
* Add support for scons to disable build with Decimate and Boolean modifier.
(WITH_BF_DECIMATE and WITH_BF_BOOLEAN)
2011-10-29 23:56:07 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
ad1d3dd30f
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
2011-10-24 07:56:42 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
e417e011d5
Code cleanup: file operations merged into single header, some function names
...
made less cryptic and changed to indicate if they work on files or directories.
2011-10-22 15:35:49 +00:00
74017cb020
header cleanup and typo's
2011-10-22 01:53:35 +00:00
4e118bb22f
svn merge ^/trunk/blender -r40890:40950
2011-10-14 01:35:20 +00:00
bc40f11093
header cleanup (no functional changes)
2011-10-10 09:38:02 +00:00
17f0ff5f7f
svn merge -r40279:40295 ^/trunk/blender
2011-09-17 13:15:38 +00:00
d4898f9c40
use macros RAD2DEG & DEG2RAD rather then multiplying by 180.0/M_PI or M_PI/180.0
2011-09-17 09:43:51 +00:00
fddc655aec
svn merge -r40140:r40148 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-12 04:57:20 +00:00
4bd0a2ba2d
replace VECCOPY -> copy_v3_v3, added copy_v*_v*_short too for typesafe copying, some parts of the code are copying float -> short normals without scaling. fix coming next.
2011-09-12 04:14:12 +00:00
42b87af8a7
svn merge -r38600:38700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 04:31:59 +00:00
a22de3f73c
Effector calculations are now thread safe.
...
* where_is_object_time was called for every effector evaluation only to determine the object velocity in some rare cases.
* Calculating the effector velocity is now done in the effector precalculation stage.
* Removing this makes the code thread safe and also should give some nice performance boosts when simulating a lot of points.
* Thanks to MiikaH for noticing this problem.
2011-07-24 17:44:22 +00:00
c98148a963
=bmesh= merge from trunk at r36153
2011-04-15 01:19:13 +00:00
69bd72c3b6
quiet gcc float -> double promotion warnings.
2011-04-02 02:08:33 +00:00
74e044065b
Fix for [ #26665 ] Force field absorption does not work
...
* Old bug fix led to all kinds of wrong behavior with "plane" shaped effectors, now things are working properly again.
2011-03-29 12:50:43 +00:00
c2ee06a4b2
Particle charge effector wasn't working properly.
...
* Probably just forgot this code somewhere a long time ago.
2011-03-24 12:12:54 +00:00
Nathan Letwory
0ff06e21cd
doxygen: blender/blenkernel tagged.
2011-02-27 20:40:57 +00:00
f01261d040
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
0955c664aa
fix for warnings from Sparse static source code checker, mostly BKE/BLI and python functions.
...
- use NULL rather then 0 where possible (makes code & function calls more readable IMHO).
- set static variables and functions (exposed some unused vars/funcs).
- use func(void) rather then func() for definitions.
2011-02-13 10:52:18 +00:00
0a83817672
Small particle effectors update:
...
* Greetings from farsthary: particle rotation is now taken into account for particle effector direction.
** This gives all kinds of new possibilities as he shows in his blog http://farsthary.wordpress.com/2011/02/08/vortex-particle-simple-tut/ .
**The only modification I made to his patch was to use the actual rotated particle direction as the effector direction as this defaults to the particle velocity vector, so no actual new options are needed.
* I also added an "effector amount" setting for particle effectors so that only a part of the particles can be considered as effectors. This makes it possible to create simple "farsthary vortexes" with only one particle system.
* Also some tiny reorganization of the falloff min/max values for a nicer ui.
2011-02-12 17:54:24 +00:00
89c9aaaa25
remove references to BKE_utildefines where its not needed.
...
- move GS() define into DNA_ID.h
- add BLI_utildefines as an automatic include with makesrna generated files.
2011-01-07 19:18:31 +00:00
8f21a43535
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.
...
no functional changes.
2011-01-07 18:36:47 +00:00
fe19e5336b
Fix for [ #25095 ] Particle systems and object with collision modifier bug
...
* Collisions didn't take emitter object layer into account
2010-12-10 08:29:46 +00:00
fe8d5b81b0
use c90 compatible static initializers.
2010-11-03 06:31:53 +00:00
Nathan Letwory
715fa82769
Make sure separation between modifier keys is communicated from GHOST upwards too (BGE at least uses this).
2010-10-24 12:45:47 +00:00
1de1d6537e
Fully disable AUD's FFTW3 usage.
2010-10-24 00:09:23 +00:00
c092a18fcb
[ #24209 ] Texture Forcefields: Use Object Coordinates produces incorrect results (patch included)
...
* Original patch provided by Alexander Beels and modified a bit by me.
2010-10-18 08:17:04 +00:00
8268a4be71
most unused arg warnings corrected.
...
- removed deprecated bitmap arg from IMB_allocImBuf (plugins will need updating).
- mostly tagged UNUSED() since some of these functions look like they may need to have the arguments used later.
2010-10-16 14:32:17 +00:00
dea59cc5eb
warning fixes and minor cmake changes.
2010-09-18 03:55:56 +00:00
9234f29e67
bugfix [ #23405 ] PNG Images bigger then 2gig wont load with blender.
...
all image formats should be able to load files bigger then 2gig (when its supported)
2010-09-15 06:43:36 +00:00
a755f9f7ed
Fix for [ #23734 ] Force Fields Min/Max don't work
...
*Special case for planar vortex field
2010-09-09 07:52:35 +00:00
bb7339a7ae
merge with trunk at r31523
2010-09-04 05:31:25 +00:00
728b713d86
use more BLI math functions.
2010-08-15 15:14:08 +00:00
e62c0ea835
replace macros VECCOPY and QUATCOPY with inline math functions no functional changes
...
also replace mul_m4_v3() with mul_v3_m4v3() in a few places.
2010-07-26 06:34:56 +00:00
c11c196efa
part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)
2010-07-19 04:44:37 +00:00
61b0a5bdb5
Fix for [ #22410 ] Texture force field doesn't depend on empty location (patch by Matt Ebb)
2010-06-18 11:36:51 +00:00
47e1f253c5
Fix [ #22160 ] blender 2.5 alpha2 can't open file grass.blend from blenderguru
...
Textures were being called with multitex_ext with osatex enabled, but NULL derivates.
Fixed this for texture effectors and a couple of other places.
2010-04-26 02:23:13 +00:00
fba7ebcbea
replace add_v3_v3v3() --> add_v3_v3() where possible
2010-04-21 12:27:48 +00:00
f7717b2e80
option to use curve point weights to influence particle effectors.
2010-04-21 11:59:47 +00:00
666cca69e9
Cloth simulation can now use a group to specify which objects
...
to collide with, in addition to the effectors group.
(commit 27746 by Brecht from render25 branch)
2010-03-26 10:52:55 +00:00