Blender Git Loki

change lamp wkey menu for render branch (dont merge this back on its own)

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29381:29385

* grab does not flatten things out so much now (not so much yanking)
* grab uses add/sub and shift key to control whether it pushes or pulls, since new behavior does not allow you to do both at the same time
* grab now obeys strength, so make sure its turned up high enough

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29361:29381

grab and yank weren't identical, there was a bug in grab

* Removed separate contrast brush. The same effect can be gotten by inverting the flatten brush.
* correct rotation of textures; was CW when it should have been CCW
* corrected problem where when image texture was replaced with procedural and the tile overlay was not generated correctly
* there are now two brushes yank and grab that are currently identical. yank will keep old behavior, grab will be changed

* Fixed layer brush so that it works in subtract mode.
* Shift key can no longer turn Contrast into Flatten and visa versa
* reduced the range in which brush changes transparency so that it doesn't become too bold or too hard to see
* the old brush cursor no longer changes opacity so that it does not become too hard to see
* if the on-surface brush radius shrinks to smaller than 6 pixels, it is drawn as a solid circle to avoid it becoming hard to see
* adjusted thickness of on-surface brush upwards so that it doesn't get too thin
* when drawing anchored, the on-surface brush now drawn outside of the area being affected
* renamed Restore Mesh to Drag and Drop

* Enabled Add/Subtract button for Fill and Scrape
- Fill in subtract mode makes holes deeper without widening them.
- Fill in subtract mode also makes grooves around bumps
- Scrape in subtract mode makes bumps bigger without widening them.
- Scrape in subtract mode also makes lips around grooves.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29331:29361

* Added a button to invert the mask
* Renamed mask "Full" to "Fill"

* Updated the default blend (only in my branch) to add a mask brush for sculpt.

* A little refactoring, pulled some common code together in multires

* Fixed masks not updating correctly from lower levels.

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29193:29346

* spacing slider and adaptive strength controls were missing

The *previous* commit was a merge with trunk:
29259-29340

* fixed: subtraction color did not show
* fixed: gliche with overlay displaying before cursor touches model

* Stencil buffer pixel format request for Mac OSX (Cocoa)
* Only the current projected or unprojected size slider appears in the UI at one time
* "Lock Brush" or "Use Surface Size" is now "Blender Units"
* Added UI for controlling the scale, offset, and rotation of the texture
* Added overlay graphic for "Tiled" texture map mode. Can be turned off and on. Transparency can be adjusted.
- Known bug: overlay may not draw properly if texture is modified from an image to a prodedural texture.
- Known bug: overlay regenerates and uploads a texture every time it is drawn.
* Added "Restore Mesh" feature to strokes that allows you to drag a shape around on the surface to place it carefully
* Unchecking "Original Normal" now hides the "Normal Direction" list box
* Added 'Edge-to-edge' checkbox that appears when 'Anchored' is selected. It allows 'anchor' daubs to be applied by selecting accross the diameter where the user wishes to place it.
* The airbrush rate, smoothstroke, and spacing modifiers are hidden now when their respective strokes are not selected
* Added controls to select the color of each individual brush in both add and subtract mode.
* Only the add color is used for brushes that only have one mode.
* Layer does not use direction so removed the add/subtract button for it.
- Possible bug? The layer tool does not behave correctly in subtract mod if it is allowed
* Renamed 'offset' in the texture controls to 'depth offset'
* Added defaults of red for + and blue for - in new_brush and readfile
- Possible bug? It feels like the UI loses focus where it shouldn't. Everything gets greyed out.
* Commented out notification functions for changes in Brush values. Since both sliders aren't visible anymore.
* Moving the mouse cursor keeps track of the direction of movement so that 'rake' has a more sensible starting angle.
* The thickness and transparency of the 'on surface' brush changes depending on strength and tablet pressure
* The anchor brush shows a small dot as a cursor which expands to surround the area that is being stamped
- Bug: it is not advisable to combine 'use blender units' with an overlay because it is too unstable with changes in brush size
- Bug: it does not appear to me that loading textures as GL_LUMINANCE_ALPHA makes dark areas more transparent
- Bug: even though I have tried to adjust the anchor brush so that it only outlines areas outside its influence it seems too small still
* Careful coding in several places to make sure that textures are consistently offset, scaled, and rotated in the overlay and in tiled and fixed modes
* The f-key now scales the brush in blender units or pixels depending on which one is selected
* The 'on surface' brush requires that the depth buffer be saved so I modified the "triple" update path to save depth values as well.
- The defaults for OpenGL pixel transfers are used to insure speed, this is a much better solution than the alternative of rerendering the viewport completely.
- The implementation uses Read/DrawPixels which is considered 'slow', a better implementation would use ARB_depth_texture and ARB_fragment_program
* There is a potential for bugs around where I changed opengl state because although I tried to ensure I set all state I need, I do not know what Blender considers to be its defaults.
* Fixed non-standard C in sculpt.c
* Made outline of brush on surface thinner
* fixed the horrible hack I was using to make the on-surface brush routine work. cpu usage when the brush is over the model is now reasonable

tiny correction for PyAPI Background Image: Windows.SetBgImage(image)
function call activates background-image-mode if disabled

after discussion with cambo reverting since he doesn't like this approach.