ba8d1b940f
option to build without remesh modifier for cmake and scons
2011-12-31 03:34:44 +00:00
289c8b5758
Add remesh modifier (dual contouring).
...
This patch adds a new remeshing modifier. The algorithm is based on
the paper "Dual Contouring of Hermite Data", and the implementation
was contributed to Blender by Dr. Tao Ju.
The contributed code is in intern/dualcon, and was modified to compile
under gcc and work on 64-bit systems. Files not needed for Blender
were removed and a small C wrapper was added in order to interface it
with Blender. The rest of the patch is just standard modifier stuff.
Reviewed by Sergey, code review link:
http://codereview.appspot.com/5491053/
The remesh icon was contributed by Zafio:
http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2 .
Thanks to everyone in that thread for the icon proposals and
discussion.
Documentation and examples on the Blender wiki:
http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier
In case the history is needed for anything, check the remesh-modifier
branch of this git repository:
https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
85a97f64a7
add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment.
...
also some cmake formatting edits.
2011-12-29 01:46:58 +00:00
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
7d0b5920c6
rename cmake WITH_OCEANSIM --> WITH_MOD_OCEANSIM and tag CYCLES_CUDA_BINARIES_ARCH as advanced.
2011-11-13 14:16:43 +00:00
Lukas Toenne
11c83d8432
Ocean Sim modifier patch
...
by Matt Ebb, Hamed Zaghaghi
This adds a new Modifier "Ocean" to simulate large-scale wave motion.
Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3]
The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled.
[1]
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean
[2]
http://www.savetheoceansim.com
[3]
http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
92d35b74e7
svn merge -r41722:41723 ^/trunk/blender
2011-11-11 06:25:45 +00:00
cd338a4130
Merge with trunk r41411
2011-10-31 13:18:14 +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
7eadd540d4
svn merge ^/trunk/blender -r40872:40890
2011-10-13 22:50:01 +00:00
8be3249537
Merge with trunk r40991
2011-10-13 21:43:02 +00:00
7306eb84f0
move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls).
2011-10-09 21:11:51 +00:00
161c3861bc
svn merge ^/trunk/blender -r40395:40405
2011-09-23 10:58:20 +00:00
15cb47bf91
Merge with trunk r40409
2011-09-20 17:51:04 +00:00
0169079bd1
Get rid of c++ in blenkernel and modifiers
...
Also use guarded allocations for navmesh stuff.
2011-09-20 16:24:50 +00:00
ca662d0fd6
svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-12 00:38:57 +00:00
b988a2abf8
Recast: fix bad level calls, Recast compiled out if BGE not enabled. SCons updated but not tested.
2011-09-11 14:13:04 +00:00
0383fb5341
svn merge -r40104:40117 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-11 08:28:16 +00:00
3a5f2272ad
cmake edits to navmesh so includes are not added unless the game engines enabled.
2011-09-11 00:08:07 +00:00
75b3936128
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-10 23:49:39 +00:00
01dca44a84
disable navmesh feature when building without the game engine.
2011-09-10 04:21:58 +00:00
c1c4743696
svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-09 12:21:41 +00:00
24c9369477
svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-08 08:08:31 +00:00
dbd6658d73
svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-07 15:34:04 +00:00
e74e245030
svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 03:16:12 +00:00
c643363905
svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 00:31:00 +00:00
Lukas Toenne
8e0fe8bff7
Merged the particles-2010 branch with node improvements into trunk.
...
This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too.
Detailed information can be found on the wiki page:
http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
6c3bb8b903
EditMesh-based skin node drawing
2011-07-31 02:03:48 +00:00
cae05598b1
Added DNA and RNA for skin modifier, stubbed in skin modifier functions
2011-07-31 02:03:28 +00:00
fc95382a97
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-26 03:55:23 +00:00
1e2e080853
Adding WeightVG modifiers code. Still some points to tweak, though.
...
NOTE : Haven’t yet tested build with scons, will do asap (unless someone else does :) ).
2011-07-25 15:27:01 +00:00
2a97e5a772
Merge with trunk r38619
2011-07-22 18:51:53 +00:00
5792bd7cc7
cmake: cleanup include paths, some duplicates and going up some unneeded dirs.
2011-07-17 09:11:13 +00:00
410c5e3cd2
cmake source definitions:
...
remove missing includes and use more strict formatting.
2011-07-16 23:01:14 +00:00
b937a4f5b6
Merge with trunk r37546
2011-06-16 12:00:03 +00:00
f122a74b1e
svn merge -r37078:37335 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-06-09 15:20:29 +00:00
Nick Samarin
5ceb8b3d35
synched with trunk at revision 37212
2011-06-05 18:51:00 +00:00
a440679c57
edits to make these cmake files compatible with my own basic cmake parser which checks for correctness in our files.
2011-06-04 11:06:41 +00:00
8949387186
svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-05-31 05:28:00 +00:00
09da9d4393
cmake maintenance
...
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
3b41ab432b
Applied Dynamic Paint 1.18f patch as a codebase for GSoC.
2011-05-24 07:08:58 +00:00
Nick Samarin
a918040902
synched with trunk at revision 36569
2011-05-16 20:30:59 +00:00
6ef77cf95a
=bmesh= merge from trunk at r36529
2011-05-08 23:43:18 +00:00
6b0d932c0d
warp modifier, added in the render branch for durian.
...
simple modifier, almost like a hook, except it can deform with 2 object source -> target, has option to preserve rotation and use different falloff types.
2011-05-01 15:16:59 +00:00
d88bb9115f
=bmesh=
...
Coded a new modifier, "Precision UV Interpolation",
that triangulates, subdivides, then uses brecht's mean
value interpolation to interpolate face data.
Textures on ngon faces get interpolated a bit nicer, in
other words (though concave cases, e.g. 'N', don't work very well).
2011-03-25 00:32:38 +00:00
f01261d040
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
Nathan Letwory
322ff7dfe4
I swear, it was just an innocence change in guardedalloc!
...
The butterfly wing flap, causing a nice storm in the rest of blender.
Now all dependencies should point ok again. CMakers, do double-test.
2011-02-21 12:35:04 +00:00
Nick Samarin
c5f6a01dd5
synched with trunk at revision 34793
2011-02-16 17:07:18 +00:00
1bd0db59f4
use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken.
...
in the case of python this makes it easier to move to find_package(PythonLibs) when 3.x is supported.
2011-01-25 14:43:13 +00:00
