Blender Git Commits

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Preview generation on Windows: attempt to fix mysterious error by using even more ID's names.

Passing around ID's themselves is not safe - they may change their mem addresses.

Yet, I had no issue on linux, but on win build this is still not enough,
have to use a super strange hack (add an 'import sys' line just before where error happens)
to get things running...

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

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

Cleanup of ugly allocation stuff (cast of void pointer, not-so-safe sizeof()'s, etc.).

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Rework job multi-level listing - factorize even more and avoid recursion.

This is much cleaner than previous code...

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Cleanup.

Merge branch 'master' into asset-experiments

Add previews to scenes, and enhance batch preview generation.

Batch preview generation can now also generate 'internal' previews (materials, textures etc.),
as well as scene ones. Also, some basic Cycles handling is there now.
You can now chose which kind of data to generate previews for, and whether the files are
trusted or not (for py autorun and drivers).
And rendering happens in background again, issue was actually a bug in creator.c, fixed in master.
Main TODOs reamining here: OpenGL rendering, and find a way to prevent '.blend1' when
saving over (either as a new option of save op, or simply by removing those files in script?).

Added a batch cleanup of previews too.

Also, added path of files as their tooltip 'image' button in main filebrowser view,
quite useful with the 'recursive' option...

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

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

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_fileselect.h
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/fsmenu.c
source/blender/editors/space_file/space_file.c
source/blender/makesrna/intern/rna_space.c

Merge branch 'master' into asset-experiments