Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
This repository is a part of the Shotgun Pipeline Toolkit.

- For more information about this app and for release notes, *see the wiki section*.
- For general information and documentation, click here: https://tank.shotgunsoftware.com/entries/23888727
- For general information and documentation, click here: https://support.shotgunsoftware.com/entries/95441257
- For information about Shotgun in general, click here: http://www.shotgunsoftware.com/toolkit

## Using this app in your Setup
All the apps that are part of our standard app suite are pushed to our App Store.
This is where you typically go if you want to install an app into a project you are
working on. For an overview of all the Apps and Engines in the Toolkit App Store,
click here: https://tank.shotgunsoftware.com/entries/23874562.
click here: https://support.shotgunsoftware.com/entries/95441247.

## Have a Question?
Don't hesitate to contact us! You can find us on toolkitsupport@shotgunsoftware.com
Don't hesitate to contact us! You can find us on support@shotgunsoftware.com
3 changes: 2 additions & 1 deletion app.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand All @@ -18,6 +18,7 @@
import sys
import os


class MultiLoader(sgtk.platform.Application):

def init_app(self):
Expand Down
2 changes: 1 addition & 1 deletion hooks/filter_publishes.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
2 changes: 1 addition & 1 deletion hooks/tk-3dsmax_actions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
2 changes: 1 addition & 1 deletion hooks/tk-3dsmaxplus_actions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
2 changes: 1 addition & 1 deletion hooks/tk-houdini_actions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
2 changes: 1 addition & 1 deletion hooks/tk-mari_actions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
2 changes: 1 addition & 1 deletion hooks/tk-maya_actions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
2 changes: 1 addition & 1 deletion hooks/tk-motionbuilder_actions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
19 changes: 16 additions & 3 deletions hooks/tk-nuke_actions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down Expand Up @@ -130,9 +130,22 @@ def _create_read_node(self, path, sg_publish_data):

(_, ext) = os.path.splitext(path)

valid_extensions = [".png", ".jpg", ".jpeg", ".exr", ".cin", ".dpx", ".tiff", ".tif", ".mov"]
valid_extensions = [".png",
".jpg",
".jpeg",
".exr",
".cin",
".dpx",
".tiff",
".tif",
".mov",
".psd",
".tga",
".ari",
".gif",
".iff"]

if ext not in valid_extensions:
if ext.lower() not in valid_extensions:
raise Exception("Unsupported file extension for '%s'!" % path)

# find the sequence range if it has one:
Expand Down
2 changes: 1 addition & 1 deletion hooks/tk-photoshop_actions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
10 changes: 5 additions & 5 deletions info.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down Expand Up @@ -140,11 +140,11 @@ description: "Locate published files and reference them into your scene."

# Required minimum versions for this item to run
requires_shotgun_version:
requires_core_version: "v0.14.66"
requires_core_version: "v0.16.32"
requires_engine_version:

# the frameworks required to run this app
frameworks:
- {"name": "tk-framework-shotgunutils", "version": "v2.x.x"}
- {"name": "tk-framework-qtwidgets", "version": "v1.x.x"}
- {"name": "tk-framework-rdo", 'version': "vx.x.x"}
- {"name": "tk-framework-shotgunutils", "version": "v4.x.x"}
- {"name": "tk-framework-qtwidgets", "version": "v2.x.x"}
- {"name": "tk-framework-rdo", 'version': "v0.0.x"}
2 changes: 1 addition & 1 deletion python/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
2 changes: 1 addition & 1 deletion python/tk_multi_loader/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
2 changes: 1 addition & 1 deletion python/tk_multi_loader/action_manager.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2013 Shotgun Software Inc.
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
Expand Down
34 changes: 34 additions & 0 deletions python/tk_multi_loader/constants.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Copyright (c) 2015 Shotgun Software Inc.
#
# CONFIDENTIAL AND PROPRIETARY
#
# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
# Source Code License included in this distribution package. See LICENSE.
# By accessing, using, copying or modifying this work you indicate your
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
# not expressly granted therein are reserved by Shotgun Software Inc.

"""
Constants used by the loader.

"""

# fields to pull down for published files
PUBLISHED_FILES_FIELDS = ["name",
"version_number",
"image",
"entity",
"path",
"description",
"sg_status_list",
"task",
"task.Task.sg_status_list",
"task.Task.due_date",
"project",
"task.Task.content",
"created_by",
"created_at",
"version", # note: not supported on TankPublishedFile so always None
"version.Version.sg_status_list",
"created_by.HumanUser.image"
]
Loading