Blender Git Commits

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29309:29331

added API support for Background Image: Windows.GetBgImage(), Windows.SetBgImage(image)

* Replaced bad usage of inline keyword with CCG_INLINE.

COLLADA branch: keep bone animation sampling keys in ascending order.

Render Branch: revert last optimization commit, gives problems with
some nested node materials, will fix this properly as part of my
next commit with some deeper changes.

Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29245:29309

Render Branch: optimization to skip irradiance cache with node sss
materials in some cases, should save about 25% rendertime on the
baby dragon.

fix to bug - [#20084] merging two triangle to a quad creates a hole.

* Fixed a bug in the mesh color buffer updating
* Added a mask brush to sculpt mode, behaves as a normal brush but affects mask not coords. Note that for non-multires, you have to create a mask layer before the brush will do anything.
* Cleared some memory that valgrind warned was uninitialized

this adds a strength multiplier, which gives the end user greater control over the maximum strength. This might be removed later, but gives some room for end users to experiment with brush strengths to find sane defaults for the max brush strength for various brush types.

* Sculpting now pays attention to the mask

* Started integrating the customdata facegrids type. For now it's used for storing paintmasks with multires, more to come here.
* Updated disp_run to update masks. I'm treating mask layers as actual values rather than displacements as is done with mdisps; results look better this way I think.
* Added color buffer updating for VBOs built from grids.
* Changed the paint_mask_set operator to update multires too.

Notes
* For now I've hardcoded the use of mask data into DMGridData and other places. We don't actually always want that extra float though, that's temporary. Plan is to set up something similar to the way CCGSubsurf deals with variable-sized vert/edge/face data.
* This commit enables all the calculations needed to create, show, and update masks, but they aren't used for sculpting yet, that comes soon

COLLADA branch: patch by Tod Liverseed.
* fix exported values of material transparency, emission and reflectivity
* add extra double_sided tag in GoogleEarth and MAX3D profiles

* PBVH can now iterate over mask data coming from a mesh (not multires yet)
* The paint_mask_set operator can be used to create a mask layer and fill it with zeroes, ones, or random data (for testing)
* gpu_buffers will display the mask layer (again, only for regular meshes not multires grids yet.)

* Updated the paint_mask_set operator so that it can set mask values using the sculpt PBVH. The mask-setting part is commented out until the PBVH is ready.

Preparing VBO drawing code for colors.
* Added functions to load paintmask data into the color buffer
* Drawing is enabled, but no visible effect since I haven't set up any paintmask layers yet.

* Fixed bug in the buffer VBO code; no reading from a buffer mapped as GL_WRITE_ONLY.

Merged with trunk: 29203-29259
Had to modify source/blender/editors/render/CMakeLists.txt to make build work in MSVC

* Changed CCGSubSurf's Vert macros into functions that operate on any number of floats, rather than just three.
* Added a new field to CCGMeshIFC to control how many floats those functions will operate on.
* For now it's always three, so there should be no visible change in behavior.

== Surface Brush & Surface Size Lock ==
I now consider surface brush and size lock to be alpha quality now.

* paint brush no longer shows when the model is not hit
* added slider for "surface size" and changed name of "lock brush size" to "Use Surface Size", also fixed issue with surface size only taking effect when you start to sculpt.
* checkbox to activate "draw brush on surface"
* temporary hack to get surface drawn brush to refresh, i force blender to redraw the screen when its on
* Fixing this hack will require that there be a way to tell the "triple" drawing path to save and restore the zbuffer
* if stencil buffer usage is a problem, then maybe it could be a global option
* temporary hack to get surface size and brush size to refresh in real time (just need to do more research on this one)
* Still to-do: drawing the smooth and anchor brushes on the surface correctly