Blender Git Loki

Blender Git "asset-experiments" branch commits.

Page: 14 / 54

January 7, 2016, 13:51 (GMT)
Fix a crash when deleting a lib featuring some proxyob source...
January 7, 2016, 09:28 (GMT)
Merge branch 'master' into id-remap
January 6, 2016, 20:40 (GMT)
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/BKE_library_query.h
source/blender/blenkernel/intern/library_query.c
source/blender/makesrna/intern/rna_ID.c
January 4, 2016, 19:41 (GMT)
Merge branch 'asset-engine' into asset-experiments
January 4, 2016, 19:41 (GMT)
Merge branch 'id-remap' into asset-experiments
January 4, 2016, 19:35 (GMT)
Merge branch 'master' into asset-engine
January 4, 2016, 19:34 (GMT)
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/library.c
January 4, 2016, 11:10 (GMT)
Merge branch 'asset-engine' into asset-experiments
January 4, 2016, 11:10 (GMT)
Merge branch 'id-remap' into asset-experiments
January 4, 2016, 10:55 (GMT)
Merge branch 'master' into asset-engine
January 4, 2016, 09:58 (GMT)
Merge branch 'master' into id-remap
December 31, 2015, 11:56 (GMT)
Merge branch 'asset-engine' into asset-experiments
December 31, 2015, 11:56 (GMT)
Merge branch 'id-remap' into asset-experiments
December 31, 2015, 11:50 (GMT)
Merge branch 'master' into asset-engine
December 31, 2015, 11:50 (GMT)
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_material.h
December 27, 2015, 12:09 (GMT)
Merge branch 'asset-engine' into asset-experiments
December 27, 2015, 12:09 (GMT)
Merge branch 'id-remap' into asset-experiments

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/windowmanager/intern/wm_operators.c
December 27, 2015, 12:06 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/windowmanager/intern/wm_operators.c
December 27, 2015, 11:54 (GMT)
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_ID.h
December 20, 2015, 14:41 (GMT)
Merge branch 'master' into id-remap
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021