Blender Git Loki

don't access particles state through allocator

declare more attributes in same place

Merge branch 'master' into functions

LANPR: Re-added free() function for scene_free_ex.

Merge remote-tracking branch 'origin/master' into temp-lanpr-cleanup

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/writefile.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files_link.c

GPencil: Use Object location instead of 3D cursor for Grab Brush

Instead to use the 3D cursor as reference point (legacy code), it would be better use the object location.

Merge branch 'master' into greasepencil-object

Cycles: Fixed an issue where volumes were skipped when the camera was inside more than one volume.

Cycles: Followup fix for my previous commit, there were uninitialized variable.

Cycles: Another fix for deferred ray marching, this time a buffer underflow.

Cycles: More consolidation for deferred ray marching

Cycles: Deferred ray marching now correctly spearates multiple intersections with the same object

Cycles: Fixed bug where deferred ray marching would always march to infinity

Cycles: Fixed a mistake in my previous volume change - deferred ray marching would count multiple intersections of the same volume incorrectly.

Cycles: adding provisions to prevent volume stack overflow, don't add the same volume object twice even when there's empty space in between

Cycles: fixed BV-5 - state update on volume bounce was overwriting bounce index and caused early path termination

Cycles: Fixed an issue with deferred ray marching where it wouldn't update the volume stack properly for volume scattering.

Cycles: Small fix for deferred ray marching.

Merge branch 'master' into greasepencil-object