Blender Git Loki

merge with trunk 60449

rigidbody: Try to use old collision shape if creating new one fails

Switching to box in that case isn't very nice behaviour and should be
avoided if possible.

rigidbody: Add impulse threshold for collision based activation

rigidbody: Only handle activation when collision was detected

Somehow missed to add this before.

svn merge -r60273:60421 ^/trunk/blender

Merged revision(s) 60321-60384 from trunk/blender into soc-2013-dingto.

Projection paint layers:

* Better naming for new layers
* Allow Custom Size for new layers

Adaptive fill works for float images too.

Modify fill tool to be adaptive. It uses a fill threshold to spread from
the mouse position outwards to colors similar to the initial one. I'm
not entirely sure about the threshold algorithm, but it is a solid base
that can be improved upon.

Only byte images working for now, float images coming next.

VDB texture:
* Avoid slow file open every time valid_vdb_file is called (in every texture3D
call), do a quick filename extension check for now.
* Pass float coordinates to the GridSampler instead of rounding to integers.

Fix bug in OpenVDB with an uninitialized variable in the default Transform.

some comments in GPU_raster.h feature flags

missed adding GPU_pixels.h to CMakeLists.txt, also renamed GPU_uncache_pixels to GPU_pixels_uncache (was inconsistent with GPU_pixels_cache)

because I had not used the feature yet, I had not noticed that I had 'object' and 'param' parameters backwards in the implementation of aspects. also fixed potential bug when using a 'param' and mixing up calls to different aspects

fancier shader compiler error messages

Finished work adding selection mode hooks. Selection mode uses an alternative set of aspect functions and most aspects can share a default or leave them unimplemented. This keeps each aspect shader from having to implement its own selection mode shader.

left gpu_common_intern.h out of project

adding hooks for select mode (incomplete so I can change locations)

More UI cleanup for the fill tool, it doesn't support accumulation or
size.

Fix accumulation flag UI not appearing

Fixups for GPU_sprite. Needed to make a distinction between "points" and "sprites"

Sprites are only drawn by the GPU_ASPECT_SPRITE, while points can be drawn by any aspect. Sprites can be round and, in the future they may be textured, while points have to be square and flat.