Blender Git Commits

Fix incorrect OS X warning message in console when using multisample antialiasing
about number of samples not matching the requested number.

Fix #34759: cycles texture influence for particles not shown correct when switching
to a different texture slot.

Fix #34849: crash in operator search menu, due to brush stencil poll
function not checking NULL pointer.

Tweak allocation vars for linear space so black is converted
to black when using GLSL display transform.

Box and Ellipse mask nodes will now output shape
even if nothing is attached to input.

They'll use black image with render resolution
as a background if nothing is attached to mask input.

Was a request from 4K ToS project.

Fix #34803: blender internal SSS rendering black/nan with negative texture colors.

Fix for potential missing draw-update when building without OCIO

More usage of GLSL for color managed image drawing

Uses GLSL for drawing image in Image Editor space.

This requires change in image_buffer_rect_update, so
original float buffer is being updated as well. This
is unlikely be something bad, but will keep an eye
on this change.

Also no byte buffer allocation happens there, this
is so because byte buffer used for display only
and in case of GLSL display such allocation and
partial update is just waste of time.

Also switched OpenGL render from using CPU color
space linearization to GLSL color space transform.
Makes OpenGL rendering pretty much faster (but
still slower than in 2.60).

internal changes:

- Added functions to setup GLSL shader for color
space conversion in colormanagement.c. Currently
conversion form a colorspace defined by a role to
linear space is implemented. Easy to extend to
other cases.

- Added helper functions to glutil.c which does
smarter image buffer draw (calling all needed OCIO
stuff, editors now could draw image buffer with a
single function call -- all the checks are done in
glutil.c).

- Also added helper function for buffer linearization
from a given role to glutil.c. Everyone now able to
linearize buffer with a single call.

This function will do nothing is GLSL routines fails
or not supported.

And one last this: this function uses offscreen
drawing, could potentially give issues on some
cards, also will keep an eye on this.

Fixes for recent GLSL display space conversions

- Building without OCIO will give correct results again
- If GLSL failed to compile, fallback to glaDrawPixelsAuto
will happen.

More Histogram fixes:

Sequencer histogram was calculating still badly, now it uses a per-color
component counter to calculate the levels (instead of counter for all)

Fix #34711: matcap option not showing when switching from cycles material/rendered
draw mode to blender internal.

Fix #34788, #34744: GLSL error, #version line needs to be at the top of the shader
and this wasn't the case anymore after recent changes.

Cycles: small code cleanup + fix SSS closure mixed with other closures doing
a bit too much work.

Fix 34831: SSS issue with non-progressive render, due to error in closure merging code.

Bugfix for [#34845] FFmpeg: .wav file playback crashes Blender since r55693

Fix #34832: SSS render freeze with object instances.

Fix #34833: crash using SSS node on windows, invalid memory access when building lookup table.

Removed leftover debug print.

Fix compilation on MinGW(64/32)

Also, add appropriate lib paths for recent OpenCollada for mingw32 (coming soon to an svn server near you)

Missing GLEW path in CMake, fixes compile error in OS X.