Blender Git Commits

style cleanup: brace placement/newlines

fix bug in own recent edits - shape key insertion

Patch #31570: Implementation of 'Include bone children' Option

Fix new compositor color to value/bw conversion working different than it did
before. It doesn't make much sense to always multiply with alpha, especially
if it's a premul image that already has it multiplied in.

Patch by Irie Shinsuke.

fix for incorrect range function args.

Port mask node to new compositor system

Works in the same way as double edge node -- not actually multithreaded
but currently it's fast enough to be used in such way. In the future it
might be changed in some way.

Move actual mask rasterization code to BKE so it's resued by old compositor
system and new compositor. Also in the future it might be used to display
mask preview in mask editor.

Graph Editor - View All/Selected now includes handles for calculating extents of
F-Curves

It is possible to get the old behaviour (handles excluded) by bringing up the
Operator Properties (F6) while in the Graph Editor (this doesn't work elsewhere
due to the context requirements of this stuff).

shapekeys for masks - this doesnt use existing shapekey code however.

style cleanup

svn merge ^/trunk/blender -r46963:46966

style cleanup

fix for building without audaspace

Merging r46725 through r46963 from trunk into soc-2011-tomato

* removed clamp from color correction

Code Cleanup - DNA_space_types.h - Part 2 - Rearranging Stuff

* Moved all enums to immediately follow the struct(s) that they are used for/by.
Less jumping around the file to find these

* Reshuffled the order of a few structs/editor groupings. For example, now all
animation editors are grouped together, and most general/property editors are
grouped together.

Code Cleanup - DNA_space_types.h - Replaced all #define-lists with enums

* All lists of #defines now replaced with enums
* All flags are now defined using the "(1 << x)" style, which is easier to
read/maintain than the other variations

Restoring Group Colours for Animation Channels - Part 1

This commit restores the group colours support for F-Curves and F-Curve Groups
in the DopeSheet and Graph Editors. Currently the relevant settings for groups
are only exposed via RNA, but a followup commit will add support for
automatically setting these colours. By default, DopeSheet and Graph Editors are
set to display these colours if/when they are available.

This functionality used to be in 2.48, and is a useful mechanism for visually
distinguishing between channels for different controls when animating (if group
colours are used on the rigs too).

style cleanup: comma placement

code cleanup: fix possible use of uninitialized value and remove dead initializations.

Image.gl_touch - routine to prevent the image to be cleared by blender cache garbage collection system
* if the image is not loaded (bindcode == 0) load the image

This needs to be called often. If the image is 'cleaned' by Blender, it will not help to load it after.
[ gl_load returns the errors: GL_STACK_OVERFLOW(1283) or GL_STACK_UNDERFLOW (1284) ]

Thanks Campbell for the suggestion on how to handle this (BKE_image_tag_time)