Skip to content

Commit

Permalink
Merge pull request getavalon#10 from tokejepsen/develop
Browse files Browse the repository at this point in the history
Support "parents" data member instead of "hierarchy".
  • Loading branch information
mkolar authored Apr 26, 2019
2 parents fa88862 + 65480f8 commit 09ed7be
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions launcher/control.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,10 @@ def on_asset_changed(self, index):
# TODO(marcus): These are going to be accessible
# from database, not from the environment.
asset = io.find_one({"_id": frame["asset"]})
if "hierarchy" in asset["data"]:
api.Session["AVALON_HIERARCHY"] = asset["data"]["hierarchy"]
if "parents" in asset["data"]:
api.Session["AVALON_HIERARCHY"] = "/".join(
asset["data"]["parents"]
)
frame.update(asset)
frame["environment"].update({
"asset_%s" % key: value
Expand Down

0 comments on commit 09ed7be

Please sign in to comment.