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
74c6c91ba6
svn merge ^/trunk/blender -r42080:42095
2011-11-23 17:14:27 +00:00
8d5d87c447
Fixed some glitches with WeightVG modifiers:
...
* Added some RNA tooltips, now that they are supported by dropdown lists.
* Fixed some RNA num properties UI steps.
* Fixed a memory leak in Proximity modifier (when dm of "target" object had to be created, it wasn’t freed...).
2011-11-23 14:40:15 +00:00
8eb41f0fdb
svn merge ^/trunk/blender -r41998:42009
2011-11-20 16:05:51 +00:00
Lukas Toenne
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
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
c8f374f486
make ocean rna more consistent with existing rna names
2011-11-14 07:18:32 +00:00
c993ee678a
new math utility function isect_plane_plane_v3
2011-11-13 16:28:52 +00:00
00b695a6f3
Ocean Sim: sort alphabetically in modifier list, fix python error trying to
...
show "Built without OceanSim modifier" message.
2011-11-13 14:54:11 +00:00
4ad0456675
Ocean Sim:
...
* Changed the user interface for the Ocean modifier, to use less space and look better.
* Changed rna name cachepath to filepath for consistency (fluid cache path also uses "filepath")
2011-11-13 12:45:47 +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
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
0503a4f7a6
svn merge ^/trunk/blender -r41100:41150
2011-10-24 04:18:28 +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
d4541fd891
Merge with trunk r41197
2011-10-22 16:43:23 +00:00
fe30dcbfb6
Minor: fix [ #28899 ] Frequently used modelling modifiers moved further out of reach by new Vertex Weight modifiers.
2011-10-20 09:53:02 +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
aa6d7ebd14
svn merge ^/trunk/blender -r40720:40872
2011-10-09 07:31:15 +00:00
8714fb7019
replace sprintf with strcpy where no formatting is done and return value isn't used.
2011-10-09 06:03:38 +00:00
e8bb972f3c
Merge with trunk r40782
2011-10-04 11:42:44 +00:00
646a397297
add a collection function slot for assignment (not used yet).
2011-10-01 15:40:32 +00:00
effea8c29b
svn merge ^/trunk/blender -r40511:40587
2011-09-27 03:12:31 +00:00
1ddb64817d
Minor: Added PROP_DISTANCE sub-type to min/max dstances of WeightVG Proximity, and Radius of Warp modifiers.
2011-09-24 16:17:23 +00:00
14475d07cd
svn merge -r40295:40367 ^/trunk/blender
2011-09-21 17:15:54 +00:00
15cb47bf91
Merge with trunk r40409
2011-09-20 17:51:04 +00:00
1794767171
/blender/makesrna: Removed final points in UI strings and messages.
...
Plus a few splits of very long lines…
2011-09-19 13:23:58 +00:00
1ff373ef5b
svn merge -r40166:40279 ^/trunk/blender
2011-09-17 04:59:14 +00:00
0d355a8a2c
replace BLI_strncpy with BLI_strncpy_utf8 where input isnt ensured to be valid.
...
also replace strcpy's which copy using "" with str[0]='\0'
2011-09-15 12:26:48 +00:00
75b3936128
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-10 23:49:39 +00:00
357febc168
fix for building with collada and some other warnings
2011-09-10 09:38:38 +00:00
9de082dbf4
Dynamic Paint:
...
* Enabled modifier "Apply" button since it can now be used to apply displacement or output layers to the mesh.
* Default surface output names are now unique in case canvas has multiple surfaces of same type.
* Merged "face aligned" and "non-closed" brush options to a single "Project" toggle, available for "Proximity" brushes.
* Added more icons to user interface selections.
* Increased default proximity distance.
* Set proximity falloff ramp to only affect alpha by default.
* Removed some no longer required render ext. functions.
* Fix: geometry node vertex alpha didn't work unless "Vertex Color Paint/Light" was enabled from material.
2011-09-10 08:55:44 +00:00
1334d3cb45
NAVMESH Modifier was not alphabetical correct in the modifier list, as the others.
2011-09-10 07:14:35 +00:00
ca170a8ed6
forgot to resolve one conflict in previous merge
2011-09-09 12:37:56 +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
38b2618319
svn merge -r40034:40051 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-09 02:29:44 +00:00
41703b851d
Modifiers: put uv project and vertex weight modifiers in separate category,
...
couldn't really think of a good name for it, suggestions welcome.
2011-09-08 12:53:01 +00:00
61b6fcd804
svn merge -r39991:40034 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-08 08:29:49 +00:00
24c9369477
svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-08 08:08:31 +00:00
1f0bb0e035
Vertex Weight Proximity: minor updates and fixes.
...
*Updated UI code (replaced “row columns” by splits ;) ).
*Clamped global influence to [0.0, 1.0] range!
*Added/edited some tooltips for Proximity.
*Proximity distance mapping can now be reversed by entering Lowest Dist > Highest Dist.
*Moved mapping before masking in Proximity, much more sensible this way!
2011-09-08 07:36:59 +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
520778163d
interface + naming improvements to vertex wright modifier
...
- WeightVG -> Vertex Weight
- mapping_mode -> falloff_type
- nicer layout for VertexWeightModifiers add/remove options
2011-09-07 07:46:26 +00:00
e74e245030
svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-06 03:16:12 +00:00
42faf7ae41
Merge with trunk r39928
2011-09-05 17:06:09 +00:00
5a3c6ccadb
Merging r39847 through r39930 from trunk into vgroup_modifiers.
2011-09-05 16:27:25 +00:00
4393df9320
VGroup Modifiers: added mapping options to proximity and edit.
...
*Added Smooth/Sharp/Root/etc. mappings to WeightVGEdit modifier, in addition to custom curve one.
*Added Smooth/Sharp/Root/etc. mappings to WeightVGProximity modifier, without the custom curve one!
*Factorized the common mapping code into MOD_weightvg_util.
2011-09-05 16:16:00 +00:00
