Blender Git Commits

Merged revision(s) 60385-60458 from trunk/blender into soc-2013-dingto.

Merged revision(s) 60321-60384 from trunk/blender into soc-2013-dingto.

Volume:
* Comment some unused variables to silence a few compile warnings.

Merged revision(s) 60246-60320 from trunk/blender into soc-2013-dingto.

Branch maintenance:
* Bring the brach in sync with hair bsdf and ao_alpha code from trunk, somehow didn't work in r60244.

Merged revision(s) 60244-60245 from trunk/blender into soc-2013-dingto.

Note: 60243 was merged in r60244 already, log info was wrong.

Merged revision(s) 60149-60242 from trunk/blender into soc-2013-dingto.

Resolved conflicts in kernel_path.h, osl_closures.cpp and stdosl.h.

Merged revision(s) 60078-60148 from trunk/blender into soc-2013-dingto.

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

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.

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.

Merged revision(s) 59995-59999 from trunk/blender into soc-2013-dingto.

Yeah I know. :P

Merged revision(s) 59930-59994 from trunk/blender into soc-2013-dingto.

Fix for OSL volume closure flattening, this was not copying settings from the OSL closures.

Removed invalid code from volume closure, the OSL distinction has to happen on a different level and doesn't make any sense. The function body works in both SVM and OSL case.

Reinstated the OSLShader API functions for volumes, fixed the function signature.

Fix for last commit, forgot to rename the shader in 2 locations. :/