http://www.miikahweb.com/feed.php MiikaHweb - Blender Asset-experiments Branch http://www.miikahweb.com/ MiikaHweb - Blender Asset-experiments Branch fi Sun, 25 Aug 19 11:58:41 +0000 MiikaHweb RSS contact at miikahweb.com <![CDATA[[bcc020b]: Merge branch 'asset-engine' into asset-experiments]]> http://www.miikahweb.com/en/blender/git-logs/commit/bcc020b1bc1b60f6cbd6d2c9bf400744931e57e1 bcc020b
Branches : asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'asset-engine' into asset-experiments

Conflicts:
source/blender/blenloader/intern/readfile.c

----------------------------------------
0 Paths Changed]]>
Mon, 25 Jul 2016 17:33:55 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/bcc020b1bc1b60f6cbd6d2c9bf400744931e57e1Bastien Montagne
<![CDATA[[3f36cd3]: Changed most of ID_IS_LINKED_foo checks as needed.]]> http://www.miikahweb.com/en/blender/git-logs/commit/3f36cd3f33e52d53d82a3a221e2a576cf26390a5 3f36cd3
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Changed most of ID_IS_LINKED_foo checks as needed.

Basically, due to new 'virtual' libraries & 'path' assets, we consider those 'virtualmy linked' IDs as:
* Local for editing purpose (i.e. they are editable).
* Linked for datablock management purposes (i.e. they can be made local, etc.).

Note: all this is more like a quick hack to test 'file-based' asset repositories (like cloud)
in comming weeks. I really do not think we should use that in the end, an full-featured
'overriding ID' system (as proposed in replacement of proxies for 2.8) would be much saner imho.

----------------------------------------
14 Paths Changed]]>
Mon, 25 Jul 2016 15:37:34 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/3f36cd3f33e52d53d82a3a221e2a576cf26390a5Bastien Montagne
<![CDATA[[4a298b1]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/4a298b10ec465f59f7db804ae9cb299fc921cda7 4a298b1
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Mon, 25 Jul 2016 13:07:44 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4a298b10ec465f59f7db804ae9cb299fc921cda7Bastien Montagne
<![CDATA[[521222b]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/521222b545aa5c88c8ac6ba1b4086c329df4b702 521222b
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Mon, 25 Jul 2016 14:42:35 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/521222b545aa5c88c8ac6ba1b4086c329df4b702Bastien Montagne
<![CDATA[[5e469bb]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/5e469bbd9549cbe2dd280d73f605b5a98a008db1 5e469bb
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

Conflicts:
source/blender/windowmanager/intern/wm_init_exit.c

----------------------------------------
0 Paths Changed]]>
Sat, 16 Jul 2016 13:39:50 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/5e469bbd9549cbe2dd280d73f605b5a98a008db1Bastien Montagne
<![CDATA[[70e3f86]: Some more small fixes regarding ID/library asset handling.]]> http://www.miikahweb.com/en/blender/git-logs/commit/70e3f86809c71c55eeb31ca7e1d8ce6c9ccd1b88 70e3f86
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Some more small fixes regarding ID/library asset handling.

----------------------------------------
2 Paths Changed]]>
Sun, 24 Jul 2016 13:58:16 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/70e3f86809c71c55eeb31ca7e1d8ce6c9ccd1b88Bastien Montagne
<![CDATA[[784f7f3]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/784f7f3264143ec6c8011173610870eefd73fc4b 784f7f3
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

Conflicts:
source/blender/windowmanager/intern/wm_files_link.c

----------------------------------------
0 Paths Changed]]>
Sun, 24 Jul 2016 16:13:36 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/784f7f3264143ec6c8011173610870eefd73fc4bBastien Montagne
<![CDATA[[d8da816]: Add more macros to differentiate actual linked datablocks from...]]> http://www.miikahweb.com/en/blender/git-logs/commit/d8da816a7ce9d6ec89ad6733089d2727dbf3a74a d8da816
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Add more macros to differentiate actual linked datablocks from 'virtually' linked ones (assets only).

Not yet used in code.

----------------------------------------
1 Path Changed]]>
Sat, 16 Jul 2016 13:54:46 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/d8da816a7ce9d6ec89ad6733089d2727dbf3a74aBastien Montagne
<![CDATA[[99bb1ac]: Merge branch 'master' into asset-experiments]]> http://www.miikahweb.com/en/blender/git-logs/commit/99bb1accbbb8e1ba38f30b073b22deb107bf3220 99bb1ac
Branches : asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_init_exit.c

----------------------------------------
0 Paths Changed]]>
Tue, 12 Jul 2016 07:15:49 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/99bb1accbbb8e1ba38f30b073b22deb107bf3220Bastien Montagne
<![CDATA[[581a819]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/581a819432249186e917d641f8a310fdacd5e1d6 581a819
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Sat, 02 Jul 2016 13:30:54 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/581a819432249186e917d641f8a310fdacd5e1d6Bastien Montagne
<![CDATA[[b0760a5]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/b0760a5c8fa96f8399e560856f53621673fb54ec b0760a5
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/readfile.c

----------------------------------------
0 Paths Changed]]>
Thu, 07 Jul 2016 13:15:48 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/b0760a5c8fa96f8399e560856f53621673fb54ecBastien Montagne
<![CDATA[[3db91de]: Reduce re-allocation while fetching UUIDs per asset engine (...]]> http://www.miikahweb.com/en/blender/git-logs/commit/3db91def28be4480e60b46720ae7f307fcab7c7d 3db91de
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Reduce re-allocation while fetching UUIDs per asset engine (asset reload area).

----------------------------------------
1 Path Changed]]>
Thu, 30 Jun 2016 08:41:03 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/3db91def28be4480e60b46720ae7f307fcab7c7dBastien Montagne
<![CDATA[[4137cc7]: Cleanup: rename BKE_asset to BKE_asset_engine.]]> http://www.miikahweb.com/en/blender/git-logs/commit/4137cc79f25333534faa08a34ec3bc2a0ee4dc61 4137cc7
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Cleanup: rename BKE_asset to BKE_asset_engine.

Since this file mostly defines/handles interactions with asset engines...

Asset handling itself is more done in library area (will split it too in next commit).

----------------------------------------
19 Paths Changed]]>
Wed, 29 Jun 2016 20:09:37 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4137cc79f25333534faa08a34ec3bc2a0ee4dc61Bastien Montagne
<![CDATA[[4dd6ffa]: Split Library/ID asset-related management into own library_asset...]]> http://www.miikahweb.com/en/blender/git-logs/commit/4dd6ffaf3768f3ebd5d9de5a68f578ae8c368eed 4dd6ffa
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Split Library/ID asset-related management into own library_asset file.

This is specific enough to deserve its own file imho, and though rather small
currently, it's likely to grow...

----------------------------------------
3 Paths Changed]]>
Wed, 29 Jun 2016 20:38:49 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4dd6ffaf3768f3ebd5d9de5a68f578ae8c368eedBastien Montagne
<![CDATA[[6ba8498]: Fix memleak whene deleting IDs with uuid!]]> http://www.miikahweb.com/en/blender/git-logs/commit/6ba84983074145bf72a34c4fc37cbd63080ee5b2 6ba8498
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Fix memleak whene deleting IDs with uuid!

----------------------------------------
1 Path Changed]]>
Thu, 30 Jun 2016 11:02:09 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/6ba84983074145bf72a34c4fc37cbd63080ee5b2Bastien Montagne
<![CDATA[[b18270f]: Add utility to print UUID (could make it nicer, but for now...]]> http://www.miikahweb.com/en/blender/git-logs/commit/b18270f43a360a3192cda5a0ad442352a4a376ac b18270f
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Add utility to print UUID (could make it nicer, but for now will do).

----------------------------------------
2 Paths Changed]]>
Thu, 30 Jun 2016 08:44:10 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/b18270f43a360a3192cda5a0ad442352a4a376acBastien Montagne
<![CDATA[[b25c224]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/b25c224d901c420acf36e2aff9100e6041746a64 b25c224
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Wed, 29 Jun 2016 16:01:35 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/b25c224d901c420acf36e2aff9100e6041746a64Bastien Montagne
<![CDATA[[732cd96]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/732cd96737007b1411a161369f842209a4c26419 732cd96
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/writefile.c

----------------------------------------
0 Paths Changed]]>
Tue, 28 Jun 2016 16:21:53 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/732cd96737007b1411a161369f842209a4c26419Bastien Montagne
<![CDATA[[71278cc]: Merge branch 'master' into asset-experiments]]> http://www.miikahweb.com/en/blender/git-logs/commit/71278cc22a26bdd73d91d13888eeeb38ac64bbad 71278cc
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-experiments

----------------------------------------
0 Paths Changed]]>
Mon, 27 Jun 2016 15:44:15 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/71278cc22a26bdd73d91d13888eeeb38ac64bbadBastien Montagne
<![CDATA[[99869da]: Merge branch 'master' into asset-experiments]]> http://www.miikahweb.com/en/blender/git-logs/commit/99869dab7c05323192bb117d5b3c6960cc7b1b4b 99869da
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_action/space_action.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_logic/space_logic.c
source/blender/editors/space_nla/space_nla.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_text/space_text.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/wm_files.h

----------------------------------------
0 Paths Changed]]>
Mon, 27 Jun 2016 15:29:09 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/99869dab7c05323192bb117d5b3c6960cc7b1b4bBastien Montagne
<![CDATA[[4c086f6]: Merge branch 'id-remap' into asset-experiments]]> http://www.miikahweb.com/en/blender/git-logs/commit/4c086f6b804dc732a4a7472934e8f45b20fdfd26 4c086f6
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'id-remap' into asset-experiments

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c

----------------------------------------
0 Paths Changed]]>
Thu, 16 Jun 2016 21:44:43 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4c086f6b804dc732a4a7472934e8f45b20fdfd26Bastien Montagne
<![CDATA[[d012380]: Merge branch 'asset-engine' into asset-experiments]]> http://www.miikahweb.com/en/blender/git-logs/commit/d012380caec622d13862b23989b908bee2155274 d012380
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'asset-engine' into asset-experiments

----------------------------------------
0 Paths Changed]]>
Thu, 16 Jun 2016 21:45:02 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/d012380caec622d13862b23989b908bee2155274Bastien Montagne
<![CDATA[[56677f4]: Fix remaining cases of datablocks' BKE_foo_free() touching...]]> http://www.miikahweb.com/en/blender/git-logs/commit/56677f4f14d5cde9922b404b4922c2e2db9e25b7 56677f4
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Fix remaining cases of datablocks' BKE_foo_free() touching usercount of their IDs.

Note that a few sub-data (like animdata) needs to keep option to unlink their
own ID usages themselves for now, this is not ideal, but need some more time
to mumble on this and find an elegant fix. Nothing blocking here anyway.

----------------------------------------
29 Paths Changed]]>
Thu, 16 Jun 2016 20:06:32 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/56677f4f14d5cde9922b404b4922c2e2db9e25b7Bastien Montagne
<![CDATA[[04ee81a]: Merge branch 'master' into id-remap]]> http://www.miikahweb.com/en/blender/git-logs/commit/04ee81a0815cedd1926b41d9f3e91d6d31766fe4 04ee81a
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into id-remap

----------------------------------------
0 Paths Changed]]>
Thu, 16 Jun 2016 17:24:14 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/04ee81a0815cedd1926b41d9f3e91d6d31766fe4Bastien Montagne
<![CDATA[[4853f75]: Merge branch 'master' into id-remap]]> http://www.miikahweb.com/en/blender/git-logs/commit/4853f75073e4d70a7fe434a41b83c33eb186964f 4853f75
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/library_query.c

----------------------------------------
0 Paths Changed]]>
Thu, 16 Jun 2016 19:13:15 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4853f75073e4d70a7fe434a41b83c33eb186964fBastien Montagne
<![CDATA[[bb4c87a]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/bb4c87a13063aaf93457b8bff253497f31a3b6c4 bb4c87a
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Thu, 16 Jun 2016 19:17:45 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/bb4c87a13063aaf93457b8bff253497f31a3b6c4Bastien Montagne
<![CDATA[[21b5ce5]: Fix bad handling of RegionView3Ds in View3D ID remap callback...]]> http://www.miikahweb.com/en/blender/git-logs/commit/21b5ce57f5f5c3e618d42e002ac4e2d0f38365bd 21b5ce5
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Fix bad handling of RegionView3Ds in View3D ID remap callback.

----------------------------------------
1 Path Changed]]>
Thu, 16 Jun 2016 16:10:44 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/21b5ce57f5f5c3e618d42e002ac4e2d0f38365bdBastien Montagne
<![CDATA[[42dda95]: Merge branch 'master' into id-remap]]> http://www.miikahweb.com/en/blender/git-logs/commit/42dda95e8931c7146837e7f1578bea3c7dbe6599 42dda95
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into id-remap

----------------------------------------
0 Paths Changed]]>
Thu, 16 Jun 2016 16:12:53 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/42dda95e8931c7146837e7f1578bea3c7dbe6599Bastien Montagne
<![CDATA[[0256d5d]: Fix reload/relocate trying to use invalid lib path.]]> http://www.miikahweb.com/en/blender/git-logs/commit/0256d5dde9c77f40c6361900fb0682aa6d7127c7 0256d5d
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Fix reload/relocate trying to use invalid lib path.

----------------------------------------
1 Path Changed]]>
Thu, 16 Jun 2016 14:06:10 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0256d5dde9c77f40c6361900fb0682aa6d7127c7Bastien Montagne
<![CDATA[[1eac4fd]: Fix missing mask ID pointer update in Clip/Image spaces' remap...]]> http://www.miikahweb.com/en/blender/git-logs/commit/1eac4fde27ddb6bbfea04cfd3311722629910b8f 1eac4fd
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Fix missing mask ID pointer update in Clip/Image spaces' remap callbacks.

----------------------------------------
2 Paths Changed]]>
Thu, 16 Jun 2016 14:56:20 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/1eac4fde27ddb6bbfea04cfd3311722629910b8fBastien Montagne
<![CDATA[[c24ba18]: Found more id-remap missing cases in spaces (new(?) ads of...]]> http://www.miikahweb.com/en/blender/git-logs/commit/c24ba18d7a241e54dd4a3f5adbe7713f882d826e c24ba18
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Found more id-remap missing cases in spaces (new(?) ads of anim editors).

----------------------------------------
3 Paths Changed]]>
Thu, 16 Jun 2016 15:16:25 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/c24ba18d7a241e54dd4a3f5adbe7713f882d826eBastien Montagne
<![CDATA[[fc10e42]: Finish TODOs related to buttons space and ID remapping.]]> http://www.miikahweb.com/en/blender/git-logs/commit/fc10e42de365943efad77367ac97280b5a33251f fc10e42
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Finish TODOs related to buttons space and ID remapping.

----------------------------------------
1 Path Changed]]>
Thu, 16 Jun 2016 14:47:32 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/fc10e42de365943efad77367ac97280b5a33251fBastien Montagne
<![CDATA[[7cbe356]: Fix broken compilation after recent refactor.]]> http://www.miikahweb.com/en/blender/git-logs/commit/7cbe356c4f497bd22116653031bda1f5aeb1ea3d 7cbe356
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Fix broken compilation after recent refactor.

----------------------------------------
2 Paths Changed]]>
Thu, 16 Jun 2016 13:59:30 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7cbe356c4f497bd22116653031bda1f5aeb1ea3dBastien Montagne
<![CDATA[[bde19b5]: Cleanup from review comments.]]> http://www.miikahweb.com/en/blender/git-logs/commit/bde19b57d61968b661b568be896ead91f90cc708 bde19b5
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Cleanup from review comments.

----------------------------------------
2 Paths Changed]]>
Thu, 16 Jun 2016 13:54:22 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/bde19b57d61968b661b568be896ead91f90cc708Bastien Montagne
<![CDATA[[dbf7d30]: Merge branch 'master' into id-remap]]> http://www.miikahweb.com/en/blender/git-logs/commit/dbf7d30744512ac733785ebdf0a163d54a5c8f54 dbf7d30
Branches : asset-engine, asset-experiments, id-remap
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into id-remap

----------------------------------------
0 Paths Changed]]>
Thu, 16 Jun 2016 13:39:54 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/dbf7d30744512ac733785ebdf0a163d54a5c8f54Bastien Montagne
<![CDATA[[1880cb6]: Merge branch 'master' into id-remap]]> http://www.miikahweb.com/en/blender/git-logs/commit/1880cb6c7503f22540b018287eb0de23efabae1f 1880cb6
Branches : asset-engine, asset-experiments, id-remap
Author : Campbell Barton (campbellbarton)
----------------------------------------
Merge branch 'master' into id-remap

----------------------------------------
0 Paths Changed]]>
Thu, 16 Jun 2016 10:03:53 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/1880cb6c7503f22540b018287eb0de23efabae1fCampbell Barton
<![CDATA[[5fd97c6]: Move remapping functions into BKE_library_remap.h]]> http://www.miikahweb.com/en/blender/git-logs/commit/5fd97c6e857d44783cc919f8dd58c46b5cf84ef6 5fd97c6
Branches : asset-engine, asset-experiments, id-remap
Author : Campbell Barton (campbellbarton)
----------------------------------------
Move remapping functions into BKE_library_remap.h

This is done since remapping is quite an involved process.

----------------------------------------
14 Paths Changed]]>
Thu, 16 Jun 2016 10:28:54 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/5fd97c6e857d44783cc919f8dd58c46b5cf84ef6Campbell Barton
<![CDATA[[d430237]: Cleanup: headers]]> http://www.miikahweb.com/en/blender/git-logs/commit/d4302372820b61c470357bd8017c865443e9486e d430237
Branches : asset-engine, asset-experiments, id-remap
Author : Campbell Barton (campbellbarton)
----------------------------------------
Cleanup: headers

----------------------------------------
3 Paths Changed]]>
Thu, 16 Jun 2016 10:41:06 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/d4302372820b61c470357bd8017c865443e9486eCampbell Barton
<![CDATA[[0d8e706]: Merge branch 'asset-engine' into asset-experiments]]> http://www.miikahweb.com/en/blender/git-logs/commit/0d8e70600bb783920a403d70a92713a9b5bfc568 0d8e706
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'asset-engine' into asset-experiments

----------------------------------------
0 Paths Changed]]>
Tue, 14 Jun 2016 14:39:47 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0d8e70600bb783920a403d70a92713a9b5bfc568Bastien Montagne
<![CDATA[[25e0f5e]: Fixes/updates needed to make asset reload work with new virtual...]]> http://www.miikahweb.com/en/blender/git-logs/commit/25e0f5e9f2922837a9c4e7cb234164d47cdee390 25e0f5e
Branches : asset-engine, asset-experiments
Author : Bastien Montagne (mont29)
----------------------------------------
Fixes/updates needed to make asset reload work with new virtual lib stuff.

----------------------------------------
1 Path Changed]]>
Tue, 14 Jun 2016 15:41:29 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/25e0f5e9f2922837a9c4e7cb234164d47cdee390Bastien Montagne