Blender Git Loki

Blender Git "asset-engine--archived" branch commits.

Page: 71 / 79

February 11, 2015, 10:14 (GMT)
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
February 10, 2015, 11:40 (GMT)
Merge branch 'master' into asset-experiments
February 9, 2015, 09:15 (GMT)
Merge branch 'master' into asset-experiments
February 9, 2015, 08:20 (GMT)
Merge branch 'master' into asset-experiments
February 6, 2015, 16:31 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenloader/intern/versioning_270.c
February 4, 2015, 19:41 (GMT)
Fix crash when appending/linking (double free...).
February 4, 2015, 19:14 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenloader/intern/versioning_270.c
February 3, 2015, 20:47 (GMT)
Make 'recursion' work as expected.

Now, recursion 0 = previous behavior,
recursion 1 = only show content of immediate .blend files, do not recurse in actual dir hierarchy,
recursion >1 = complete recursion!
February 3, 2015, 20:18 (GMT)
Flat listing of libs: do not show the 'categories' directories unless we are
inside a single .blend lib in this case, useless and heavily clutters space.
February 3, 2015, 19:45 (GMT)
Merge branch 'master' into asset-experiments
February 2, 2015, 11:16 (GMT)
Merge branch 'master' into asset-experiments
February 1, 2015, 20:02 (GMT)
Cleanup: add 'ED_' prefix to public fsmenu functions...
February 1, 2015, 19:49 (GMT)
Cleanup: get rid of unused stuff!
February 1, 2015, 19:35 (GMT)
Merge branch 'master' into asset-experiments
January 30, 2015, 17:38 (GMT)
Prepare assets UI: switch filebrowser to tools + tool props areas, instead of channels.

This will allow us to keep op panel independent, and have tabs for future assets tools!

Note 'conversion' from previous file area (channels) is not perfect, you have to hit 'T'
twice currently if you had a filebrowser in your .blend file...
January 30, 2015, 12:58 (GMT)
Merge branch 'master' into asset-experiments
January 29, 2015, 18:37 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
release/scripts/startup/bl_operators/wm.py
January 27, 2015, 18:51 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/windowmanager/intern/wm_operators.c
January 27, 2015, 11:02 (GMT)
Merge branch 'master' into asset-experiments
January 26, 2015, 20:41 (GMT)
Fix filtering in new UIList bookmarks & co.
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021