Blender Git Commits

Fix blenderplayer link issue

Yet another painter oriented commit: Add explicit way to deactivate
masking if user wants to based on artist feedback. This allows to
accumulate dabs on top of each other even in space or dab stroke mode.

The checkbox is located under the imagepaint colour settings and is
called "accumulate"

Fix 2D painting masking for pressure masking. I need to understand
better the new 2d paint code but luckilly the fix is simple!

Fix masks not working well with recent mask pressure cutoff feature in
projection painting (2d case coming next). Also revert 56986, it seems
to not be necessary anymore? At least bug #35426 seems to be working
without it now. I hope this won't backfire

Fix mask pressure masking issue in projection painting

Merge trunk -r57626 into soc-2013-paint

The start of the new level of detail system. The UI properly modifies level of detail information on the object, and allows for adding and removing levels of detail. No level of detail selection or switching occurs yet.

Add first version of pressure influence for mask textures based on
feedback from David Revoy:

http://www.davidrevoy.com/article107/textured-brush-in-floss-digital-

There are two methods, cutoff and ramp.

Cutoff simply selects between 0 and 1 based on stylus pressure while
ramp distributes the mask effect above the pressure value.

Too many words, here is a screenshot with the effect:

http://www.pasteall.org/pic/show.php?id=53865

From top to bottom:
* Strength pressure influence ON:
- No mask influence
- Cutoff mask influence
- Ramp mask influence
* Strength pressure influence OFF:
- No mask influence
- Cutoff mask influence
- Ramp mask influence

The brush masking is still in need of attention because it behaves
erratically, still it's nice for an zero.alpha commit ;)

Merge from trunk, up to r57615.

Expose drag dot mode UI for texpaint (still not functional)

Minor changes:

* Default mtex uses UV mapping.
* Default tex uses image type.

Expose material viewport mode for blender internal. This -should- be
exactly equivalent to GLSL mode on + textured view. I left the GLSL flag
inside so game engine devs can decide how to handle the flag.

Merge branch trunk -r57567 into soc-2013-paint

Secondary color support in the paint editors, and associated
operators:
* X key swaps secondary and primary colour
* Ctrl-lclick painting uses the secondary colour
* Shift-S samples colour for the secondary colour

This can obviously be used for background/foreground palettes it will
obviously be used for gradient effects later on.

merge with trunk version 57545

Branching from Trunk/blender to soc-2013-bge

Deleting soc-2013-bge to rebranch from current Trunk

rigidbody: Take deformations into account when creating collision shapes

TODO: Make sure ob->derivedDeform always esists.

svn merge -r57394:57521 ^/trunk/blender

Merging r57392 through r57521 from trunk into soc-2013-motion_track