Blender Git Commits

Mark some CCG funcrions as inlined

This seems to be giving speedup up to 10%
and in fact perhaps the change need to go
to the trunk.

Incorrectly restored UI_EMBOSS, which caused the pullout buttons on areas to be drawn incorrectly.

Adds an option in the right-click menu for dividers to remove the divider from the menubar.

Fixes a small bug whereby an RNA pointer was improperly created. Also removes the option to remove a button from a non-custom panel that was erroneously shown.

Second attempt at fixing windows + guardedalloc issues in main()

Although previous fix compiled, it would crash on startup, since
the guardedalloc changes need to read from the args passed in.
Now use plain malloc for allocating the offending array, so that
we can grab the args before they're needed.

Volume:
* Further header cleanup for sampler functions, remove unused RNG parameters.

Another windows compile fix for r.59942

Moved var declarations for unicode args array to start of main().

The fix used in the original commit won't work since the args
defined in that block won't be available for later steps.
However, they must be defined before the block of code used
to initialise the mem allocators

Sharpen tool works for 2d painting now.

Volume:
* Cleanup function headers.
* Remove some unused variables, also remove another redundant "bounce" variable in shadow_blocked_new().

Volume:
* Some style cleanup, mainly for if/else brackets.
* Remove redundant bounce parameter in kernel_path_trace_volume(), we already pass state.

Add threshold to control the sharpening. If color difference is not as
big as threshold, the pixel is not sharpened.

Sharpen tool:

* Expose a toggle for sharpen/soften, in addition to ctrl-paint
* Make sharpening listen to mask strength.
* Use floats for byte image sharpening as well. Sharpen depends on
negative values to work so floats are necessary here for correct
subtraction.

merge with trunk -r60080

Add first working code for sharpen tool in projective texturing.

To use, select the Soften tool and press Ctrl while painting.

Notes:

* Disabled masking for the soften tool, it did some weird effects, such
as brush curve having weird effects (full curve would not work, for
instance).

* Unsharp masking requires a better filter to address changes in color
in the diagonal direction. Currently it shares the filter used by the
soften brush, which is similar to a simple cross filter.

* Threshhold will be added as well, will only add shariness if edge
detection value exceeds it. Will keep other parts of the image nice and
clean.

Modify keyframe selection algorithm to be camera-aware

The keyframe selection algorithm can now select keyframes from the camera passed to it as an argument. It's worth looking into multicamera algorithms too.

Merged revision(s) 60000-60077 from trunk/blender into soc-2013-dingto.

Volume:
* Comment out some unused code.
* Remove some redundant ifdefs in shadow_blocked_new().

Volume:
* direct_emission() and indirect_primitive_emission() were inlined for some reason, change back to noinlined (as in trunk).
* Put most volume kernel code behind __VOLUME__ now.

Improve modal solver image iteration

Instead of iterating over all images and filtering through only those from camera 0, iterate over only camera 0 images. With the current way markers are stored, this is very computationally inefficient, but this should be improved soon.

Use multicamera terminology for initial image selection

To initialise reconstruction, two images need to be selected with high variance. The GRIC and variance algorithm can continue to refer to the images as keyframes, as it is intended to work with images from a single camera, but the libmv API should be more general than that, referring to selected *images*. This is a non-functional change.