f92fcbd413
Minor fix in response to Koji Iigura's mail. Own error, sorry about that (I tend to forget not all OS are utf-8 yet :/ ).
2012-04-26 11:23:37 +00:00
94b8b8913e
rename lattice influence to strength from r45144 (other deform modifiers call it strength too)
2012-03-26 00:42:21 +00:00
aede928bdc
Patch: [ #30652 ] Influence slider for Lattice Modifier
...
* This patch adds a influence slider for the lattice modifier, which affects the strength of the deformation.
Patch by Patrick Boelens (senshi), thanks a lot!
2012-03-25 22:14:21 +00:00
89a963fb7f
style cleanup: comment blocks
2012-03-09 18:28:30 +00:00
4dfc25223f
Remove struct NgonInterpModifierData and related ModifierType Info.
...
This modifier was already removed in r44288, looks like these were
just missed.
2012-03-01 02:20:10 +00:00
89a5cf40e3
remove NGon Interp modifier (which was merged as apart of BMesh),
...
this didnt really give any advantage over subsurf's Simple-Subdiv mode.
2012-02-20 23:24:57 +00:00
0fd176e03d
moved select interior faces into a C function (was python)
2012-02-19 20:27:30 +00:00
48006292d8
svn merge ^/trunk/blender -r44189:44204
2012-02-17 20:56:25 +00:00
2b7ca2304a
unify include guard defines, __$FILENAME__
...
without the underscores these clogged up the namespace for autocompleation which was annoying.
2012-02-17 18:59:41 +00:00
4966982a5a
svn merge ^/trunk/blender -r43564:43609
2012-01-22 18:04:35 +00:00
ae771e742b
change filepath limit from 240 to 1024
2012-01-21 14:54:53 +00:00
a7b0a11811
svn merge ^/trunk/blender -r43278:43294
2012-01-11 15:04:54 +00:00
51bada696f
Longer names support for all ID and other object names
...
This commit extends limit of ID and objects to 64 (it means 63 meaning
characters and 1 for zero-terminator). CustomData layers names are also
extended.
Changed DNA structures and all places where length constants were hardcoded.
All names which are "generating" from ID block should be limited by MAX_ID_NAME-2,
all non-id names now has got own define called MAX_NAME which should be used all
over for non-id names to make further name migration stuff easier.
All name fields in DNA now have comment with constant which corresponds to
hardcoded numeric value which should make it easier to further update this
limits or even switch to non-hardcoded values in DNA.
Special thanks to Campbell who helped figuring out some issues and helped a lot
in finding all cases where hardcoded valued were still used in code.
Both of forwards and backwards compatibility is stored with blender versions newer
than January 5, 2011. Older versions had issue with placing null-terminator to
DNA strings on file load which will lead to some unpredictable behavior or even
crashes.
2012-01-11 08:51:06 +00:00
d0cdefd9fa
svn merge ^/trunk/blender -r43092:43092
2012-01-04 06:20:10 +00:00
0bdbdc35b0
de-duplicate wave modifier texture function.
...
cmon - copying large functions between files is obviously stupid, dont do it!
2012-01-04 05:39:56 +00:00
520cb6f452
replace wave spesific enum with generic onces
2012-01-04 05:24:01 +00:00
78a4e24614
svn merge ^/trunk/blender -r43009:43033
2011-12-31 12:03:36 +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
50ca81154e
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
ca629d5ccc
minor dna header cleanup
2011-12-30 07:25:49 +00:00
f7609ed5f5
svn merge ^/trunk/blender -r42918:42920
2011-12-28 11:20:45 +00:00
0b00bb236c
make MOD_dynamicpaint.c use more typical gpl2+ text and some formatting edits in DNA
2011-12-28 11:08:38 +00:00
22a1ad61f9
svn merge ^/trunk/blender -r42372:42416
2011-12-04 18:39:19 +00:00
31ff21d735
add define for deprecated DNA struct members: DNA_DEPRECATED,
...
this means use of deprecated struct members gives a warning.
- makesdna.c preprocessor skips this.
- DNA_DEPRECATED_ALLOW is used so readfile.c can do versioning without warnings.
- this exposes some use of deprecated struct members, will deal with this after.
2011-12-04 06:05:48 +00:00
f28fd56f8f
svn merge ^/trunk/blender -r42095:42116
2011-11-24 05:33:22 +00:00
2345efc6c5
Patch #29336 : renaming UV (Texture) Layer to UV Map in the user interface,
...
by Gaia Clary.
Rationale: the name was confusing and not always used consistently, and this
map itself is not something that can be layered, rather the map can be used
as texture coordinates in some layered setup.
The original intent was to indicate this contained more than just UV's, but
the game engine settings have already been moved out, and apparently users
didn't really get this from the name anyway.
2011-11-23 17:25:25 +00:00
8eb41f0fdb
svn merge ^/trunk/blender -r41998:42009
2011-11-20 16:05:51 +00:00
17b113c784
Option to rename the vertex color data layer used by Ocean modifier for foam. The modifier outputs foam values to both textures and a (temporary) vertex data layer. This layer was unnamed before, which makes it impossible to access in shader nodes. Now the user can input a custom name in the modifier panel, then use that same name in a shader input node to access foam values.
...
http://www.pasteall.org/pic/21120
2011-11-20 14:16:41 +00:00
c00c0134e0
svn merge -r41847:41899 ^/trunk/blender
2011-11-16 03:10:15 +00:00
502081879b
remove unused OceanModifierData member & use smaller flags where possible
2011-11-15 03:48:25 +00:00
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
2414abae06
Ocean Modifer:
...
* Reuse the placeholder "eModifierType_EmptySlot" for the new Ocean modifier.
WARNING:
DO NOT use Ocean modifier in trunk with a revision below this commit! Files won't load then!!
2011-11-13 13:04:46 +00:00
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
afeb0eeaf0
Dynamic Paint merge:
...
Commit Dynamic Paint from "soc-2011-carrot" branch into trunk.
End-user documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Dynamic_Paint
GSoC wiki page:
http://wiki.blender.org/index.php/User:MiikaH/GSoC-2011-DynamicPaint
2011-11-10 10:24:34 +00:00
1b4a54ad73
Merge with trunk r41701
2011-11-09 15:46:53 +00:00
cb890a49fb
svn merge ^/trunk/blender -r41602:41638 .
2011-11-08 02:57:28 +00:00
f086201518
cmake & pep8 tidy up, also some style edits.
...
remove unneeded collection length function.
2011-11-08 01:32:34 +00:00
46ae692710
Merge with trunk r41342
2011-10-28 17:00:53 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +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
4e118bb22f
svn merge ^/trunk/blender -r40890:40950
2011-10-14 01:35:20 +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
317d11214e
add in empty modifier slot so dynamic paint files don't break.
2011-10-10 07:50:39 +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
e8bb972f3c
Merge with trunk r40782
2011-10-04 11:42:44 +00:00
effea8c29b
svn merge ^/trunk/blender -r40511:40587
2011-09-27 03:12:31 +00:00
274b9c8fb8
whitespace cleanup
2011-09-25 12:31:21 +00:00
5bd83eede0
svn merge ^/trunk/blender -r40405:40431
2011-09-23 11:30:55 +00:00
Bastien Montagne
Campbell Barton
Thomas Dinges
Nicholas Bishop
Sergey Sharybin
Brecht Van Lommel
Lukas Toenne
Miika Hamalainen