Blender Git Loki

Remove old preset which was corrected to Nicok D3S

Merging r47674 through r47676 from trunk into soc-2011-tomato

Merging r47669 through r47673 from trunk into soc-2011-tomato

mango request - add alpha to histogram & sample line.

Synchronize changes with trunk

Synchronize changes with tomato branch

Applied and completed a compositor patch by Brecht to use signalling and waiting in scheduling and worker threads instead of continuous loops with sleep times. This should help reduce unnecessary wait times in Tile.

Somehow this files were missed in one of merges

Merging r47667 through r47668 from trunk into soc-2011-tomato

Merging r47662 through r47666 from trunk into soc-2011-tomato

mango request
- optionally display the histogram as lines (not filled areas).
- expand the enum for faster access.
- keep the sample line displayed after doing the line sample (running again clears).

code cleanup: rename flag --> dflag (draw flag), since this is overly generic name and was passed about to many functions.

Merging r47624 through r47661 from trunk into soc-2011-tomato

Fix for Tile group nodes with internally unconnected outputs, this was crashing due to missing constant value operations for such outputs. The SocketProxyNode now checks connection of the input socket on conversion, so this also simplifies usage of proxy nodes quite a bit.

fix for un-initialized memory use for modal inset/bevel.

Missed NULL-pointer checks in poll some functions

Fix for compositor image node draw function. The image user pointer needs to be constructed explicitly from the node storage pointer.

Fix #31747, broken image sequence loading after r47432.

The image file name function was updating the iuser->framenr using a supposed cfra parameter. However, the actual cfra is unknown when loading movies or sequences, so the iuser->framenr value itself was passed in its place, leading to incremental addition of the iuser frame offset. Removed the cfra parameter altogether from the image path function. This should instead be done separately if necessary, it's not an inherent part of constructing the image file name.

remove duplicate import

OBJECT_OT_drop_named_material -- missing notifier for material panel UI update