Blender Git Loki

Add log and report filtering in info editor

Export packed image file names, not paths.

Merge branch 'master' into fcurve-modifier-panels

Revert "Outliner: Remove outliner parent object selection"

This reverts commit cebafc9854f61b3776524ea9d7586b03afc8af2f.

While this solution does work, it's not perfect and occasionally breaks,
leaving the outliner in a half-synced state.

Fix: Outliner mode column preventing element expansion

Elements in modes other than Scenes or View Layer could not be expanded
when the mode column was enabled. Just an oversight on the selection
pass through.

Merge branch 'master' into soc-2020-outliner

linear solver animatable

Use const; move constructors to implementation file.

Revert "Report filtering: use enum instead of separate bool properties"

This reverts commit 983bcc66 but preserves more error types

macos warnings

LineArt: Linked files now support collection-in-collection type of linking.

using legacy as default to pass unit test

Merge branch 'blender-v2.90-release' into soc-2020-production-ready-light-tree-2

Merge branch 'master' into greasepencil-edit-curve

Merge branch 'master' into greasepencil-object

Cleanup: support syntax highlighting directly in TextViewContext (console and info editor)

- remove TextLine from callbacks in favor of simple types
- separate textview_draw_string into dry run version (only for calculating height)
- add custom TextViewContextLine (cast compatible with TextLine)

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

Merge branch 'master' into soc-2020-io-performance

Cleanup: renaming & comments.

Fix several material import bugs, remove wrong assert.

Images were not being loaded since the parent directory was
missing in the path. So add it in tex_map_XX.