Blender Git Loki

smooth lit meshes

WIPâ?¦ still having some depth buffer issues

Merge branch 'master' into asset-experiments

draw derived mesh with GPUx API

Widgify the Graph Editor backdrop

Adds the basic cage widget to the Graph Editor backdrop. The backdrop
drawing while scaling needs to be corrected still, but besides from that
(almost) everything works now.

Fix compiling errors after Multiview commit

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_operators.c

Merge remote-tracking branch 'origin/master' into decklink

draw base mesh with GPUx API

Vertex and Edge work great, Face not so much yet â?? totface = 0 so
nothing is drawn. Will work on derived mesh next.

draw_mesh_object_new_new is simplified to draw mesh geometry and
nothing else. Use draw_mesh_object or draw_mesh_object_new for full
functionality.

tweak GPUx draw to use actual max index

instead of max allowed index.

This is a looser restriction than before.

Cycles point density: Support for OSL backend

Merge branch 'master' into cycles_point_density

Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c

Some minor tweaks for asset-engine branch...

Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c

Fix for particle texture evaluation.

RGB value from intensity was overriding explicit texture values in every
case, only do this for scalar modes.

Merge branch 'master' into asset-experiments

FileBrowser: internal listing: use own, much lighter struct to store whole list.

Since with internal listing we have no choice but to list everything, store
those data in the smallest possible struct - note we do not even store preview
here, these are only handled in full FileDirEntry cache (re-loading them from
cached thumbnails is really quick anyway).

Still not complete, have to re-do ID previews now, among other things...
And some memleaks again with previews, ugh.

Cycles point density: Avoid race condition when using same object as texture source

If the same object is used by two point density textures in Particle source mode
it was really easy to catch a crash in derived render creation.

For now solved with mutex lock around cache_pointdensity_ex() which is not ideal
but seems to be better compromise comparing to other alternatives.

Merge remote-tracking branch 'origin/master' into decklink

Merge branch 'master' into cycles_point_density