Blender Git Loki

Resolve CUDA kernel compilation error

Instead of including util_string.h which in fact also defines some
symbols from util_string.cpp include STL's string header and directly
use std::string.

Merging r50450 through r50454 from trunk into soc-2011-tomato

Fix cycles continuously updating when creating a driver for a scene property,
like driving integrator seed with #frame.

The scene drivers are evaluated continuously, which would be nice to fix but
complicated, now it compares the RNA value to see if it actually changed, and
avoids the update in that case, which is a useful optimization by itself.

(merged from tomato branch)

Fix wrong cycles tile size in viewport, could affect performance a bit.

fix for error in own recent commit

Merging r50423 through r50449 from trunk into soc-2011-tomato

make freeing sequencer strip without cache an option only exposed within sequencer.c

Cycles compiler fixes related to OSL changes:

* reverted r50430
* removed 2 util_params.h includes from r50428, these were causing trouble with OIIO in CUDA compilation. The purpose of these was to define the ustring type, but can just use the standard string type from util_string as well.

fix [#32502] Shift + V Vertex slide doesn't work for x-mirror edit

fix for crash in sequencer introduced with recent cache addition,
- running undo with metastrips would crash immediately.
- freeing a strip without a scene would crash (clipboard does this).

fix [#32475] Enabled audio lets blender crash with autosplit option for movie output

style cleanup: indentation

code clenup: comments and some style edits on ghost/osx (odd indentation)

code cleanup: capitalize defines.

fix [#32500] Odd behaviour with subdividing an ngon

support ANIMFILTER_FOREDIT for mask layers, also move deprecated metaball types to the end of the switch statement when evaluating metaballs.

code cleanup: remove deprecated defines and some struct members

committed by accident

code cleanup: BM_face_legal_splits() was doing some redundant assignments.

OSL Backend:
* Added the Phong BRDF from the inbuilt OSL shader library.

This can be used in OSL shaders only for now:
* phong(normal N, float exponent)
* phong_ramp(normal N, float exponent, color colors[8]