Blender Git Commits

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/object.c

Add moving around bookmarks (same system as for vgroups etc.).

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/editors/include/UI_interface_icons.h
source/blender/editors/interface/interface_icons.c
source/blender/windowmanager/intern/wm_files.c

Merge branch 'master' into asset-experiments

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

Nearly finished 'UIList for bookmarks'.

Got completely rid of C code for those panels.

Added full path in ttips of each 'bookmark' entry, as in current master.
Note this forced me to make tip in uiBut dynamic (like label). Not so sure
about this, but seems to me forcing tooltips to be static is actually quite
bad and limitating? we'll see...

Only remaining TODO (new feature) is reordering of bookmarks, should be easy now.

Also fixed some stupid (again!) mistake with RNA access to paths of bookmark entries.

Merge branch 'master' into asset-experiments

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

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filesel.c
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_operators.c

Merge branch 'master' into asset-experiments

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/editors/space_file/space_file.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c

Get rid of this stupid string len def, RNA knows this better!

Fix some issues with image previews.

* When overlaying icon, we have to also ensure background pict is always the same size
(else you get usgly icon size changes). Still not perfect though, suspect some more issues
in filrdraw code, probably should systematiacally run the 'ensure size' code during thumbnail
generation?
* Sharing of img ImBuf between thumbnail job and main thread could still happen,
leading to random crashes.

Fix py script generating obj/group previews after recent merge.

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/BKE_camera.h
source/blender/blenkernel/intern/camera.c
source/blender/blenlib/BLI_fileops.h
source/blender/blenlib/intern/storage.c
source/blender/editors/space_file/filelist.c
source/blender/makesrna/intern/rna_object_api.c
tests/gtests/blenlib/BLI_path_util_test.cc

Add 'dup_poin' callback param to new `BLI_duplicate_filelist()` func, to allow handling direntry's poin if needed.

Merge branch 'master' into asset-experiments

Fix issues when giving a non-existent dir to filebrowser.

Note: unlike in current master, path is checked immediately when setting it
into filelist (simpler now that filelist building itself is threaded).
`filelist_setdir()` modifies in place given path if this one is not valid.

Use new BLI fnmatch helpers to fix wrong update in some cases when editing
string search filter.

Add BLI helpers for fnmatch head/tail wildcards handling.

`BLI_fnmatch_strncpy_add_endswildcards()` will copy and add '*' wildcards on both ends of given string, if needed.

`BLI_fnmatch_strcmp_ignore_endswildcards()` is same as strcmp, but ignores any '*' wildcards on both ends of given strings.

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/editors/interface/interface_icons.c