http://www.miikahweb.com/feed.php MiikaHweb - Blender Asset-engine--archived Branch http://www.miikahweb.com/ MiikaHweb - Blender Asset-engine--archived Branch fi Thu, 26 Nov 20 01:06:09 +0000 MiikaHweb RSS contact at miikahweb.com <![CDATA[[889c4ca]: Merge branch 'asset-uuid--archived' into asset-engine--archived...]]> http://www.miikahweb.com/en/blender/git-logs/commit/889c4ca9c26d770af02cedef972d65eb173bdb5e 889c4ca
Branches : asset-engine--archived
Author : Julian Eisel (Severin)
----------------------------------------
Merge branch 'asset-uuid--archived' into asset-engine--archived

----------------------------------------
0 Paths Changed]]>
Wed, 01 Jul 2020 15:25:04 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/889c4ca9c26d770af02cedef972d65eb173bdb5eJulian Eisel
<![CDATA[[0829ceb]: Merge branch 'master' into asset-uuid--archived]]> http://www.miikahweb.com/en/blender/git-logs/commit/0829cebeb024095c268f190c34daa8ae9a5a224c 0829ceb
Branches : asset-engine--archived, asset-uuid--archived
Author : Julian Eisel (Severin)
----------------------------------------
Merge branch 'master' into asset-uuid--archived

----------------------------------------
0 Paths Changed]]>
Wed, 01 Jul 2020 15:13:57 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0829cebeb024095c268f190c34daa8ae9a5a224cJulian Eisel
<![CDATA[[87df151]: Merge branch 'asset-uuid' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/87df15190210eb84ef52e5dccc2932918f912da5 87df151
Branches : asset-engine, asset-engine--archived
Author : Julian Eisel (Severin)
----------------------------------------
Merge branch 'asset-uuid' into asset-engine

----------------------------------------
0 Paths Changed]]>
Tue, 16 Jun 2020 09:31:58 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/87df15190210eb84ef52e5dccc2932918f912da5Julian Eisel
<![CDATA[[d739208]: Merge branch 'asset-uuid' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/d73920831de0a87faa0c91261dc2ff8d07913318 d739208
Branches : asset-engine, asset-engine--archived
Author : Julian Eisel (Severin)
----------------------------------------
Merge branch 'asset-uuid' into asset-engine

----------------------------------------
0 Paths Changed]]>
Sat, 13 Jun 2020 20:54:26 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/d73920831de0a87faa0c91261dc2ff8d07913318Julian Eisel
<![CDATA[[cfde6eb]: Merge branch 'master' into asset-uuid]]> http://www.miikahweb.com/en/blender/git-logs/commit/cfde6ebf450594faa57c4bfeaecff10fe512c91b cfde6eb
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Julian Eisel (Severin)
----------------------------------------
Merge branch 'master' into asset-uuid

----------------------------------------
0 Paths Changed]]>
Tue, 16 Jun 2020 09:31:33 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/cfde6ebf450594faa57c4bfeaecff10fe512c91bJulian Eisel
<![CDATA[[5e50380]: Merge branch 'master' into asset-uuid]]> http://www.miikahweb.com/en/blender/git-logs/commit/5e50380ddc99dd8c8c8067482b2dce186e7c3fb4 5e50380
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Julian Eisel (Severin)
----------------------------------------
Merge branch 'master' into asset-uuid

----------------------------------------
0 Paths Changed]]>
Sat, 13 Jun 2020 20:54:07 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/5e50380ddc99dd8c8c8067482b2dce186e7c3fb4Julian Eisel
<![CDATA[[26428a3]: Merge branch 'asset-uuid' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/26428a3e00642299582fc73285b6b4313b981d0c 26428a3
Branches : asset-engine, asset-engine--archived
Author : Julian Eisel (Severin)
----------------------------------------
Merge branch 'asset-uuid' into asset-engine

----------------------------------------
0 Paths Changed]]>
Thu, 11 Jun 2020 13:49:47 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/26428a3e00642299582fc73285b6b4313b981d0cJulian Eisel
<![CDATA[[9dffdfc]: Fixes for changes in master after last merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/9dffdfc84b8139b8148b18c25245c3b697995d2b 9dffdfc
Branches : asset-engine, asset-engine--archived
Author : Julian Eisel (Severin)
----------------------------------------
Fixes for changes in master after last merge

----------------------------------------
12 Paths Changed]]>
Thu, 11 Jun 2020 13:50:11 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/9dffdfc84b8139b8148b18c25245c3b697995d2bJulian Eisel
<![CDATA[[0b6def7]: Fixes for changes in master]]> http://www.miikahweb.com/en/blender/git-logs/commit/0b6def7059b6a64b3cef3ba7d4fa46000aee1761 0b6def7
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Julian Eisel (Severin)
----------------------------------------
Fixes for changes in master

----------------------------------------
8 Paths Changed]]>
Thu, 11 Jun 2020 09:54:45 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0b6def7059b6a64b3cef3ba7d4fa46000aee1761Julian Eisel
<![CDATA[[15e6f90]: Merge branch 'master' into asset-uuid]]> http://www.miikahweb.com/en/blender/git-logs/commit/15e6f9012c84c4ebce41bf1928635a3abe046a55 15e6f90
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Julian Eisel (Severin)
----------------------------------------
Merge branch 'master' into asset-uuid

----------------------------------------
0 Paths Changed]]>
Thu, 11 Jun 2020 09:55:40 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/15e6f9012c84c4ebce41bf1928635a3abe046a55Julian Eisel
<![CDATA[[a8b24ca]: Merge branch 'master' into asset-uuid]]> http://www.miikahweb.com/en/blender/git-logs/commit/a8b24ca61b1859b659dd22f411cb74cef54dc229 a8b24ca
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Julian Eisel (Severin)
----------------------------------------
Merge branch 'master' into asset-uuid

----------------------------------------
0 Paths Changed]]>
Thu, 11 Jun 2020 08:13:12 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/a8b24ca61b1859b659dd22f411cb74cef54dc229Julian Eisel
<![CDATA[[4ae30b9]: Merge branch 'asset-uuid' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/4ae30b9f637a08a74b0ad09f468de040d90c9fcc 4ae30b9
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'asset-uuid' into asset-engine

----------------------------------------
0 Paths Changed]]>
Tue, 26 Nov 2019 17:18:12 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4ae30b9f637a08a74b0ad09f468de040d90c9fccBastien Montagne
<![CDATA[[15a9779]: Remove the Amber asset engine code, this has nothing to do...]]> http://www.miikahweb.com/en/blender/git-logs/commit/15a97791c84ed5f024398c40ac4bfdba723ee6fa 15a9779
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Remove the Amber asset engine code, this has nothing to do in that patch.

----------------------------------------
6 Paths Changed]]>
Tue, 26 Nov 2019 17:15:21 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/15a97791c84ed5f024398c40ac4bfdba723ee6faBastien Montagne
<![CDATA[[4da2961]: Fix after recent merge...]]> http://www.miikahweb.com/en/blender/git-logs/commit/4da29610d62657ab3960b90774f28ad93bdebe77 4da2961
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Fix after recent merge...

----------------------------------------
1 Path Changed]]>
Tue, 26 Nov 2019 17:13:59 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4da29610d62657ab3960b90774f28ad93bdebe77Bastien Montagne
<![CDATA[[9fd98f9]: Merge branch 'asset-uuid' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/9fd98f957021720c791eb57fc07c75b2bf7665ba 9fd98f9
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'asset-uuid' into asset-engine

Conflicts:
source/blender/makesrna/intern/rna_asset.c

----------------------------------------
0 Paths Changed]]>
Tue, 26 Nov 2019 17:06:12 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/9fd98f957021720c791eb57fc07c75b2bf7665baBastien Montagne
<![CDATA[[ab324e8]: Merge branch 'asset-uuid' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/ab324e8ea3f6796f607f2ba8ff0498c33fc57172 ab324e8
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'asset-uuid' into asset-engine

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

----------------------------------------
0 Paths Changed]]>
Tue, 26 Nov 2019 16:37:24 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/ab324e8ea3f6796f607f2ba8ff0498c33fc57172Bastien Montagne
<![CDATA[[c263dbe]: Merge branch 'asset-uuid' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/c263dbe996d90c4a32af232b5819e1927878eec1 c263dbe
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'asset-uuid' into asset-engine

----------------------------------------
0 Paths Changed]]>
Tue, 26 Nov 2019 16:46:25 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/c263dbe996d90c4a32af232b5819e1927878eec1Bastien Montagne
<![CDATA[[f3ae50c]: Rename some variables in AssetUUID struct.]]> http://www.miikahweb.com/en/blender/git-logs/commit/f3ae50c76511816b4a1b69a253b6843843e3490d f3ae50c
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Rename some variables in AssetUUID struct.

----------------------------------------
3 Paths Changed]]>
Tue, 26 Nov 2019 16:59:51 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/f3ae50c76511816b4a1b69a253b6843843e3490dBastien Montagne
<![CDATA[[cdacfc2]: Some more minor fixes/cleanups.]]> http://www.miikahweb.com/en/blender/git-logs/commit/cdacfc2f47915578ae54ba913b2ee4092a66ef43 cdacfc2
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Some more minor fixes/cleanups.

----------------------------------------
2 Paths Changed]]>
Tue, 26 Nov 2019 16:45:55 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/cdacfc2f47915578ae54ba913b2ee4092a66ef43Bastien Montagne
<![CDATA[[67ee496]: Updates from code review.]]> http://www.miikahweb.com/en/blender/git-logs/commit/67ee496c1b36963fd0c82708d843dbcd293807d9 67ee496
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Updates from code review.

Mostly various cleanups, and a few important fixes too (some potential
memleaks, missing writing of UUID struct for ID placeholders of linked
data-block in writefile.c).

----------------------------------------
8 Paths Changed]]>
Tue, 26 Nov 2019 16:34:11 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/67ee496c1b36963fd0c82708d843dbcd293807d9Bastien Montagne
<![CDATA[[2563953]: Merge branch 'master' into asset-uuid]]> http://www.miikahweb.com/en/blender/git-logs/commit/25639533665a2444900aa8e86ec7a0a511ff6faf 2563953
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-uuid

----------------------------------------
0 Paths Changed]]>
Tue, 26 Nov 2019 14:49:49 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/25639533665a2444900aa8e86ec7a0a511ff6fafBastien Montagne
<![CDATA[[9945fab]: Merge branch 'asset-uuid' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/9945fab5d5312560854f210d86316e401faaab18 9945fab
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'asset-uuid' into asset-engine

----------------------------------------
0 Paths Changed]]>
Tue, 26 Nov 2019 14:50:17 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/9945fab5d5312560854f210d86316e401faaab18Bastien Montagne
<![CDATA[[e7ac595]: Merge branch 'asset-uuid' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/e7ac5954c9e1c800af07eacc68b31411425d13ab e7ac595
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'asset-uuid' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_asset_engine.h
source/blender/blenkernel/intern/asset_engine.c
source/blender/blenloader/BLO_readfile.h
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_asset.c

----------------------------------------
0 Paths Changed]]>
Mon, 25 Nov 2019 17:11:05 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/e7ac5954c9e1c800af07eacc68b31411425d13abBastien Montagne
<![CDATA[[0eda3ba]: Add 'asset uuid' to IDs.]]> http://www.miikahweb.com/en/blender/git-logs/commit/0eda3bae64913fa858a2a9eef80acd15f3ebd85a 0eda3ba
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Add 'asset uuid' to IDs.

This commit is a subset of the asset-engine branch, only adding the uuid
struct to data-blocks, with a basic minimal RNA/Python API to use it.

it does not contain anything regarding asset engines and asset
management itself.

Besides being a first step towards full integration of asset engine work
into master, it is also the 'minimal requirement' from the studio here
for next Cosmos production pipeline (regarding own in-house management
tools).

----------------------------------------
26 Paths Changed]]>
Mon, 25 Nov 2019 16:42:01 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0eda3bae64913fa858a2a9eef80acd15f3ebd85aBastien Montagne
<![CDATA[[bc13ceb]: Merge branch 'master' into asset-uuid]]> http://www.miikahweb.com/en/blender/git-logs/commit/bc13ceba27c643b1b9422947ecc4dc33d6fcd2e1 bc13ceb
Branches : asset-engine, asset-engine--archived, asset-uuid, asset-uuid--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-uuid

----------------------------------------
0 Paths Changed]]>
Mon, 25 Nov 2019 16:54:58 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/bc13ceba27c643b1b9422947ecc4dc33d6fcd2e1Bastien Montagne
<![CDATA[[a05cc48]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/a05cc483f1f282187f7778fb23c4133ae1d908e2 a05cc48
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Mon, 25 Nov 2019 16:55:20 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/a05cc483f1f282187f7778fb23c4133ae1d908e2Bastien Montagne
<![CDATA[[eb62837]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/eb62837c320367d43018cccb8607faa07e2e6d23 eb62837
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Mon, 25 Nov 2019 15:07:13 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/eb62837c320367d43018cccb8607faa07e2e6d23Bastien Montagne
<![CDATA[[870bc1a]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/870bc1aa66f285ea46517bf4e5c92b6b9ede3290 870bc1a
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Mon, 18 Nov 2019 11:37:19 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/870bc1aa66f285ea46517bf4e5c92b6b9ede3290Bastien Montagne
<![CDATA[[b14b335]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/b14b335a41eecbfb9109902907e9695c012a3485 b14b335
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Thu, 07 Nov 2019 15:25:24 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/b14b335a41eecbfb9109902907e9695c012a3485Bastien Montagne
<![CDATA[[249646f]: AssetUUID: add basic default init value for asset part of it...]]> http://www.miikahweb.com/en/blender/git-logs/commit/249646f19d7a81359441ca639ba6b43beebe171c 249646f
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
AssetUUID: add basic default init value for asset part of it to rna creator.

Reauest from Cosmos pipeline R&D team.

----------------------------------------
1 Path Changed]]>
Wed, 06 Nov 2019 16:08:17 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/249646f19d7a81359441ca639ba6b43beebe171cBastien Montagne
<![CDATA[[ffb581e]: AssetUUID: add basic search for Asset UUIDs in current .blend...]]> http://www.miikahweb.com/en/blender/git-logs/commit/ffb581e7f4e3ecede1c6928a431cd35776a08228 ffb581e
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
AssetUUID: add basic search for Asset UUIDs in current .blend file.

Needed for Cosmos pipeline R&D.

----------------------------------------
4 Paths Changed]]>
Wed, 06 Nov 2019 15:52:27 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/ffb581e7f4e3ecede1c6928a431cd35776a08228Bastien Montagne
<![CDATA[[836883f]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/836883f1d2022b891fe1c27ddab2c8368a294d6e 836883f
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/editors/space_file/file_ops.c

----------------------------------------
0 Paths Changed]]>
Tue, 05 Nov 2019 13:35:04 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/836883f1d2022b891fe1c27ddab2c8368a294d6eBastien Montagne
<![CDATA[[c258ff9]: Initial basic support for assets definition in .blend file...]]> http://www.miikahweb.com/en/blender/git-logs/commit/c258ff967de1464acbfa7ad68e0241a62f8548e3 c258ff9
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Initial basic support for assets definition in .blend file itself, and RNA api access.

This still *very* basic, but should be usable as proof of concept for
Cosmos pipeline tests...

Note that the question of where to put all asset metadata remains open,
we could extend AssetUUID struct, and/or add support of IDProps to it,
or just use some special-named IDProp in IDs themselves (like the
_RNA_UI thing for custo; props UI settings...).

----------------------------------------
3 Paths Changed]]>
Tue, 05 Nov 2019 13:37:43 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/c258ff967de1464acbfa7ad68e0241a62f8548e3Bastien Montagne
<![CDATA[[5215182]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/52151821c0171482b66c9bce6d986365d4c6df1a 5215182
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_file/file_ops.c

----------------------------------------
0 Paths Changed]]>
Mon, 14 Oct 2019 19:14:03 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/52151821c0171482b66c9bce6d986365d4c6df1aBastien Montagne
<![CDATA[[bf72a5b]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/bf72a5ba901549041c6745f44e821af2a7e4777a bf72a5b
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_file/filesel.c

----------------------------------------
0 Paths Changed]]>
Thu, 10 Oct 2019 09:02:13 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/bf72a5ba901549041c6745f44e821af2a7e4777aBastien Montagne
<![CDATA[[cbbe76a]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/cbbe76a5648a26535be02a0711db7a53910879a9 cbbe76a
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Mon, 30 Sep 2019 09:34:29 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/cbbe76a5648a26535be02a0711db7a53910879a9Bastien Montagne
<![CDATA[[54b60eb]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/54b60eb1b04e08f5786dc59e1bc05c2abf1694ce 54b60eb
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/writefile.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files_link.c

----------------------------------------
0 Paths Changed]]>
Thu, 19 Sep 2019 18:51:09 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/54b60eb1b04e08f5786dc59e1bc05c2abf1694ceBastien Montagne
<![CDATA[[a644b3a]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/a644b3aba78d223bb671ae4369354662a72f76da a644b3a
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

Note: reworking filebrowser UI is still TODO.

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/include/ED_fileselect.h
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_view3d/space_view3d.c

----------------------------------------
0 Paths Changed]]>
Thu, 12 Sep 2019 13:45:01 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/a644b3aba78d223bb671ae4369354662a72f76daBastien Montagne
<![CDATA[[93e1e3e]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/93e1e3e532b991305fe5d9f0ae678d680600bc6d 93e1e3e
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Thu, 05 Sep 2019 07:46:32 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/93e1e3e532b991305fe5d9f0ae678d680600bc6dBastien Montagne
<![CDATA[[b5e5029]: Merge branch 'master' into asset-engine]]> http://www.miikahweb.com/en/blender/git-logs/commit/b5e502982ab5cd36798bfb5c374fb6ffd9bea5dc b5e5029
Branches : asset-engine, asset-engine--archived
Author : Bastien Montagne (mont29)
----------------------------------------
Merge branch 'master' into asset-engine

----------------------------------------
0 Paths Changed]]>
Thu, 05 Sep 2019 07:24:54 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/b5e502982ab5cd36798bfb5c374fb6ffd9bea5dcBastien Montagne