Blender Git Loki

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

Page: 14 / 79

August 10, 2017, 13:46 (GMT)
Merge branch 'id_copy_refactor' into id_override_static
August 10, 2017, 13:43 (GMT)
Merge branch 'master' into id_copy_refactor

Conflicts:
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_sequencer/sequencer_edit.c
August 7, 2017, 14:06 (GMT)
Merge branch 'master' into id_copy_refactor
August 7, 2017, 10:52 (GMT)
Merge branch 'master' into id_copy_refactor
July 20, 2017, 13:47 (GMT)
Split Amber into pieces!
July 20, 2017, 10:59 (GMT)
Merge branch 'master' into asset-engine
July 20, 2017, 10:50 (GMT)
Merge branch 'id_copy_refactor' into id_override_static
July 20, 2017, 10:31 (GMT)
Merge branch 'master' into id_copy_refactor
July 18, 2017, 14:40 (GMT)
Merge branch 'master' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.h
July 18, 2017, 13:13 (GMT)
Move Amber into own folder.
July 18, 2017, 12:17 (GMT)
Fix typo within Claude engine.

Not working though, something about handshake failing when trying to
update credentials...
July 18, 2017, 10:21 (GMT)
Merge branch 'master' into asset-engine
July 18, 2017, 10:08 (GMT)
Add more BKE generic way to create an override, make Image mostly overridable, fix a bug in RNA.
July 18, 2017, 09:08 (GMT)
Merge branch 'id_copy_refactor' into id_override_static
July 18, 2017, 09:08 (GMT)
Merge branch 'master' into id_copy_refactor
July 18, 2017, 09:07 (GMT)
Merge branch 'master' into id_override_static
July 17, 2017, 13:21 (GMT)
Merge branch 'id_copy_refactor' into id_override_static

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/writefile.c
July 17, 2017, 13:16 (GMT)
Extend a bit 'NO_MAIN'/'NO_USER_REFCOUNT'/etc. flags to ID allocation itself.

No real reason we keep this only to copying, creating ID outside of
database is handy as well!

Also, add helpers to add/remove an ID from Main, and to set/clear its
'user refcounting' status. Those will be useful in future complex ID
manipulation cases (like static override...).
July 17, 2017, 12:00 (GMT)
Some cosmetic renaming.
July 17, 2017, 11:50 (GMT)
Merge branch 'master' into id_copy_refactor
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021