Blender Git Loki

Blender Git "asset-experiments" branch commits.

Page: 8 / 54

April 9, 2016, 13:41 (GMT)
Merge branch 'master' into id-remap
April 7, 2016, 14:35 (GMT)
Always reset to default asset engine (i.e. regular filebrowser code) when opening a new browser.

Else we'd have the last used engine even when saving a .blend or picture, ugly!
April 7, 2016, 14:18 (GMT)
Finish implementing 'reports' in asset engine (not used yet).
April 7, 2016, 13:50 (GMT)
Some minor fixes/updates of AE API comments.
April 7, 2016, 13:26 (GMT)
Merge branch 'asset-engine' into asset-experiments

Conflicts:
source/blender/blenkernel/intern/blender.c
April 7, 2016, 13:25 (GMT)
Merge branch 'id-remap' into asset-experiments
April 7, 2016, 13:25 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/BKE_library_query.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/library_query.c
April 6, 2016, 16:05 (GMT)
Fix issue with uuid generation in Amber.
April 6, 2016, 15:38 (GMT)
More or less finished shell of 'update' code.

Code only reports which datablocks/assets shall be reloaded etc. so far, actual
reloading needs id-remap code (and hence will be implemented in asset-experiment
branch later).
April 6, 2016, 13:23 (GMT)
Merge branch 'master' into asset-engine
April 6, 2016, 13:16 (GMT)
Merge branch 'master' into id-remap
April 4, 2016, 12:45 (GMT)
Merge branch 'master' into asset-engine
April 4, 2016, 12:39 (GMT)
Merge branch 'master' into id-remap
March 31, 2016, 18:50 (GMT)
Add a 'check_dir' callback to asset engines, allowing them to control current 'root dir'.

Note that this is hacked around bpyrna incapacity to handle strings as return values of functions callbacks...
March 30, 2016, 19:39 (GMT)
Merge branch 'master' into asset-engine
March 30, 2016, 19:37 (GMT)
Merge branch 'master' into id-remap
March 30, 2016, 19:31 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library_query.c
March 30, 2016, 19:10 (GMT)
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/library_query.c
March 23, 2016, 16:16 (GMT)
Merge branch 'libquery-recursive' into asset-engine
March 23, 2016, 16:16 (GMT)
Merge branch 'master' into asset-engine
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021