Blender Git Loki

Fix basemesh target object poll function

Don't print errors when scripts or user prefs aren't found

Useful since we may want to have templates that don't contain scripts.

added preprocessing for destructor and init script strings

Mesh Convert: remove meaningless modifier check

Meshes w/o modifiers wouldn't have their derived mesh applied.
Check was to avoid crash but its in fact meaningless,
since the modifier might be disabled, or there may be virtual modifiers.

Fix T50950: Converting meshes fails w/ boolean

Merge branch 'master' into app-templates

Fix T50950: Converting meshes fails w/ boolean

Fix crash creating new window with existing layout

Splash screens for 101

Note that binary files in git isn't really accepted
(breaking own rules!)

This branch will likely be deleted and templates moved elsewhere.

Support custom splash images for templates

note that the splash can't replace the text (thats a feature!).

Merge branch 'master' into cloth-develop

Uber-picky: Remove single pixel offset on topbar

Remove all Info Editors when loading old files

Had to move some functions from ED to BKE to avoid having to duplicate
it all.
Works surprisingly well, didn't expect it to be that easy :)

cleanup in manta C api

no need to pass smoke modifier data as argument anymore

Merge branch 'master' into app-templates

Add BKE_blendfile_userdef_read_from_memory

Needed to read user-preferences from in-memory startup.blend

Also skip data-blocks when reading preferences.

Add BKE_blendfile_userdef_read_from_memory

Use so we can load user-preferences on their own from memory.

Use alternate lighting

Use lighting and font paths from template

Merge branch 'workspaces' into topbar

Conflicts:
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/workspace/screen_ops.c
source/blender/editors/workspace/workspace_layout_edit.c
source/blender/gpu/intern/gpu_framebuffer.c
source/blender/windowmanager/intern/wm.c