Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
d095f94
up to date ssvfx writenode
daawaa Sep 10, 2018
1488195
Merge pull request #1 from ssvfx41/version_up_dev
Sep 10, 2018
8010607
test
daawaa Sep 10, 2018
8901cf9
Reverted Precomp/Element versioning
daawaa Sep 12, 2018
314de7d
Merge pull request #2 from ssvfx41/version_up_dev
Sep 12, 2018
a6cbca9
try function to catch the autocrop - DPX non option
daawaa Sep 13, 2018
1c03bb9
Merge pull request #3 from ssvfx41/version_up_dev
Sep 13, 2018
3048580
WIP shot OCIO
daawaa Sep 20, 2018
5313023
updated for roto/cleanup linear EXRs
daawaa Sep 20, 2018
90d140a
Merge pull request #4 from ssvfx41/roto_dev
Sep 20, 2018
ed2bc2a
Merge pull request #5 from ssvfx41/roto_dev
Sep 20, 2018
bf1638e
cleanup of fileset and colorspace
daawaa Sep 20, 2018
73ff5c1
Cleanup of new Roto Version
daawaa Sep 21, 2018
caf7ce4
Merge pull request #6 from ssvfx41/roto_dev
Sep 21, 2018
9f02a92
wip
daawaa Sep 26, 2018
db880c3
Merge branch 'master' into ocio_dev
Sep 26, 2018
e36197e
Merge pull request #7 from ssvfx41/ocio_dev
Sep 26, 2018
116babc
Merge pull request #8 from ssvfx41/ocio_dev
Sep 26, 2018
8d044e4
latest ocio setup - ready for testing on projects
daawaa Sep 26, 2018
c21e1ce
hide all ocio for non-ocio proj
daawaa Sep 28, 2018
f3943c4
Merge pull request #9 from ssvfx41/ocio_dev
Sep 28, 2018
fca0f25
hiding autocrop for jpeg
daawaa Sep 28, 2018
2ebe317
Merge pull request #10 from ssvfx41/ocio_dev
Sep 28, 2018
910eff5
color space fix - test for global color settings
daawaa Sep 28, 2018
56f3f81
Merge pull request #11 from ssvfx41/ocio_dev
Sep 28, 2018
02685ad
cleanup of color space settings
daawaa Sep 28, 2018
efc7e5e
Merge pull request #12 from ssvfx41/ocio_dev
Oct 1, 2018
12f1c7a
fixed project crop issue
daawaa Oct 1, 2018
fc9467c
Merge pull request #13 from ssvfx41/ocio_dev
Oct 1, 2018
885dc6e
fixed non-Version proj_reformat
daawaa Oct 1, 2018
37f74c8
setting default colorspace for Roto
daawaa Oct 1, 2018
c743b19
Merge pull request #14 from ssvfx41/ocio_dev
Oct 1, 2018
254a831
Merge pull request #15 from ssvfx41/roto_dev
Oct 2, 2018
3ebf993
fixed roto file reopen issue
daawaa Oct 2, 2018
35e77f5
cleanup of roto. Rearranged OCIO set profile
daawaa Oct 5, 2018
c3dd4a3
Merge pull request #16 from ssvfx41/roto_dev
Oct 5, 2018
d2419d9
need to copy the disbled OCIO to converted node
daawaa Oct 5, 2018
43464d8
Merge pull request #17 from ssvfx41/roto_dev
Oct 5, 2018
c316aa2
roto channel set to all
daawaa Oct 16, 2018
919c4e4
Merge pull request #19 from ssvfx41/roto_dev
Oct 16, 2018
3d8031f
updated embed crop to reformat
daawaa Oct 17, 2018
85d06d3
Merge pull request #20 from ssvfx41/roto_dev
Oct 17, 2018
a2de57a
update to convert SG node
daawaa Oct 18, 2018
29032ab
Merge pull request #21 from ssvfx41/roto_dev
Oct 18, 2018
ac562bd
cleanup of sg convert
daawaa Oct 19, 2018
b260d7c
Merge pull request #22 from ssvfx41/roto_dev
Oct 19, 2018
63a57bc
fix break with multiple groups when converting SG writes
daawaa Oct 19, 2018
66b549a
cleanup
daawaa Oct 19, 2018
56add87
Merge pull request #23 from ssvfx41/fixes
Oct 19, 2018
ccdfcd2
disabled ocio embed node if no OCIO criteria met
daawaa Oct 19, 2018
e3b76c4
Merge pull request #24 from ssvfx41/fixes
Oct 23, 2018
ea6de3d
black outside true on SG reformats
daawaa Oct 23, 2018
b446309
Merge pull request #25 from ssvfx41/fixes
Oct 23, 2018
624a9d0
Major update
daawaa Nov 2, 2018
7e6115e
cleanup
daawaa Nov 2, 2018
4676923
moved pos of colorspace application
daawaa Nov 2, 2018
698f71a
Merge pull request #26 from ssvfx41/fixes
Nov 2, 2018
ee9ca17
removed Final, fixed channels post-convert, hide convert on Versions
daawaa Nov 5, 2018
b0fe41e
Merge pull request #27 from ssvfx41/fixes
Nov 5, 2018
2b4fbda
commented out channels knob
daawaa Nov 5, 2018
d53e129
Merge pull request #28 from ssvfx41/fixes
Nov 5, 2018
361ef3c
inpanel = false on all create nodes
daawaa Nov 6, 2018
5d29e8c
Merge pull request #29 from ssvfx41/fixes
Nov 6, 2018
6136586
cleanup of tk_channel_cache issue
daawaa Nov 6, 2018
1272fa5
Merge pull request #30 from ssvfx41/fixes
Nov 6, 2018
f20e2e4
clean and push again
daawaa Nov 6, 2018
196a625
Merge pull request #31 from ssvfx41/fixes
Nov 6, 2018
06f3952
fixed roto HD issue
daawaa Nov 6, 2018
7403750
Merge pull request #32 from ssvfx41/fixes
Nov 6, 2018
760a6b6
autocrop on for Roto Version
daawaa Nov 7, 2018
204edaf
autocrop on embed Write on for certain profile types
daawaa Nov 7, 2018
f184b6c
Merge pull request #33 from ssvfx41/roto_dev
Nov 7, 2018
fa2e3e2
caching project reformat bool for reopen/convert
daawaa Nov 8, 2018
792255f
Merge pull request #34 from ssvfx41/fixes
Nov 8, 2018
d27d4f7
fixed cached proj bool issue
daawaa Nov 13, 2018
7a91d26
added format dsiable when proj_bool selected
daawaa Nov 13, 2018
9f01b3b
wip
daawaa Nov 15, 2018
b4ea29b
working currently - artist to test
daawaa Nov 15, 2018
0f8a7bb
Merge pull request #36 from ssvfx41/ocio_dev
Nov 16, 2018
4991852
sanity test for ocio
daawaa Nov 16, 2018
eef87e3
wip
daawaa Nov 18, 2018
809dbbb
added ocio warning and conversion now keeps ocio bool
daawaa Nov 18, 2018
70100e4
Merge pull request #37 from ssvfx41/ocio_dev
Nov 18, 2018
abd6f0f
Merge pull request #38 from ssvfx41/mattes_dev
Nov 18, 2018
808652e
wipto get HD and detail
daawaa Nov 18, 2018
1e3443b
Merge branch 'master' into mattes_dev
daawaa Nov 18, 2018
18dc56f
fixed and working in foa
daawaa Nov 19, 2018
0ceb3a4
wip - needs to remove Matte as an option from the WT list
daawaa Nov 19, 2018
4373d5e
Added logto lin conversion around proj reformat
daawaa Nov 20, 2018
dbc730a
Merge pull request #39 from ssvfx41/mattes_dev
Nov 20, 2018
d0dfd80
Merge branch 'master' into fixes
daawaa Nov 23, 2018
fd7f6e9
removing project reformat
daawaa Nov 23, 2018
afa4a01
Update handler.py
daawaa Nov 23, 2018
d6f9adb
reinstate project reformat - removed filter type
daawaa Nov 23, 2018
e7e5930
removing proj reformat filtering
daawaa Nov 23, 2018
14c6dd7
Merge pull request #41 from ssvfx41/fixes
Nov 23, 2018
d698ff1
disabled proj_reformat
daawaa Nov 23, 2018
1f4f478
Merge branch 'master' into fixes
daawaa Nov 23, 2018
d56bcd1
Merge pull request #42 from ssvfx41/fixes
Nov 23, 2018
9721a70
apply lanczos6 to comp task only
daawaa Nov 28, 2018
57dfbd2
Merge pull request #43 from ssvfx41/fixes
Nov 28, 2018
fbed06e
linear transfer for matte dpx
daawaa Nov 30, 2018
0e36c57
Merge pull request #44 from ssvfx41/fixes
Nov 30, 2018
859ab06
removed ocio SG info node section
daawaa Feb 5, 2019
79cecbd
Merge pull request #45 from ssvfx41/fixes
Jun 18, 2019
a435915
Merge pull request #46 from ssvfx41/fixes
Jul 8, 2019
565d936
updated for channels_cache for node channel info store
Jul 8, 2019
b4da8a6
Merge pull request #47 from ssvfx41/fixes
Jul 8, 2019
ad3938a
added channels_cache
Jul 8, 2019
c49d442
Merge pull request #48 from ssvfx41/fixes
Aug 26, 2019
7df8a1d
major edits
Aug 26, 2019
be87300
removed older templates
Aug 26, 2019
9f9857e
Merge pull request #49 from ssvfx41/fixes
Aug 29, 2019
6147225
reomoving folder creation
Aug 29, 2019
c5a4adb
Merge pull request #50 from ssvfx41/fixes
Sep 3, 2019
826c433
revert SV to 16bit - no diff in Sams check
Sep 3, 2019
e43bf39
Merge pull request #51 from ssvfx41/fixes
Sep 3, 2019
b5914bb
removed GOT legacy and set color space
Sep 3, 2019
a5b312d
removed legacy nodes
Sep 3, 2019
34841a6
Merge pull request #52 from ssvfx41/fixes
Sep 5, 2019
5a45b25
adding internal format_crop to loose bb and pixel edge
Sep 5, 2019
d400647
adding task_name for template resolution
Sep 12, 2019
e1fee5f
Merge pull request #53 from ssvfx41/fixes
Sep 12, 2019
6528bdc
added disabled internal shuffle
Sep 13, 2019
ffb7436
Merge pull request #54 from ssvfx41/fixes
Sep 13, 2019
bafb3bc
checking for assigned mattes. moved shot_info into method
Sep 16, 2019
2a98973
Merge pull request #55 from ssvfx41/fixes
Sep 16, 2019
54b0e0a
removed old ocio section
Sep 16, 2019
c310cf6
Merge remote-tracking branch 'upstream/master' into fixes
Sep 16, 2019
1caee51
latest - fixed outdated gizmo
Sep 17, 2019
8fac073
cleanup
Sep 17, 2019
90f6c8b
Merge pull request #56 from ssvfx41/fixes
Sep 17, 2019
b8bdc50
Added conversion button to Test
rct2124 Oct 4, 2019
40cd76f
removed convert_to_write button from Test/Version
rct2124 Oct 11, 2019
91b3bf6
updated profile setup for mattes
Oct 16, 2019
5dee698
Added functionality in asset context
rct2124 Nov 1, 2019
656dc78
version patch
rct2124 Nov 5, 2019
2bda8b5
Merge pull request #57 from ssvfx41/dduffy-dev
Nov 13, 2019
a749fb1
added STMap
Nov 13, 2019
e3f4768
Merge pull request #58 from ssvfx41/dduffy-dev
Dec 18, 2019
a70803d
updated to pick up from the Project page
Dec 18, 2019
3fbc1e3
update for colorspace
Dec 18, 2019
d145122
Merge pull request #59 from ssvfx41/dduffy-dev
Dec 18, 2019
fc6232b
Merge pull request #60 from ssvfx41/dduffy-dev
Dec 18, 2019
daf8954
hard-code
Dec 18, 2019
4892fbc
fixed roto issue
Jan 16, 2020
4b5ef9d
Merge pull request #61 from ssvfx41/dduffy-dev
Jan 16, 2020
1fce42c
Merge pull request #62 from ssvfx41/dduffy-dev
Jan 29, 2020
5539b09
cleanup - delivery off by default
Jan 29, 2020
5988c20
Merge pull request #63 from ssvfx41/dduffy-dev
Feb 3, 2020
3a2932d
setting rgb and taking out BB specs
Feb 3, 2020
d82489b
Merge pull request #64 from ssvfx41/dduffy-dev
Mar 3, 2020
4be1a58
fix for dpx
Mar 3, 2020
b60912f
update to project formats
Apr 21, 2020
60bd85a
Merge branch 'master' into dduffy-dev
Apr 21, 2020
807e45d
Merge pull request #65 from ssvfx41/dduffy-dev
Apr 21, 2020
9cb017d
patch to add elements to roto write options
rct2124 Sep 30, 2020
571730c
taking out TC
Oct 6, 2020
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject
gizmos/tab_stats.dat
python/tk_nuke_writenode/handler.py.functional
51 changes: 38 additions & 13 deletions app.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ def get_node_render_template(self, node):
"""
Return the render template for the specified node
"""
return self.__write_node_handler.get_render_template(node)
write_type = self.__write_node_handler.get_node_write_type_name(node)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trailing whitespace


return self.__write_node_handler.get_render_template(node, write_type)

def get_node_publish_template(self, node):
"""
Expand Down Expand Up @@ -204,7 +206,8 @@ def reset_node_render_path(self, node):
"""
self.__write_node_handler.reset_render_path(node)

def convert_to_write_nodes(self, show_warning=False):
def convert_to_write_nodes(self, selected_node=None, show_warning=False):

"""
Convert all Shotgun write nodes found in the current Script to regular
Nuke Write nodes. Additional toolkit information will be stored on
Expand All @@ -215,6 +218,7 @@ def convert_to_write_nodes(self, show_warning=False):
:param create_folders: Optional bool that sets whether the operation will create the required output folders;
defaults to False
"""
self.__write_node_handler.convert_sg_to_nuke_write_nodes(selected_node=None)

# By default we want to convert the write nodes, unless the warning is shown and the user chooses to abort.
continue_with_convert = True
Expand Down Expand Up @@ -265,33 +269,53 @@ def convert_from_write_nodes(self, show_warning=False):
if continue_with_convert:
self.__write_node_handler.convert_nuke_to_sg_write_nodes()

def create_new_write_node(self, profile_name):
def create_new_write_node(self, profile_name, write_type):
"""
Creates a Shotgun write node using the provided profile_name.
"""
self.__write_node_handler.create_new_node(profile_name)
new_node = self.__write_node_handler.create_new_node(profile_name, write_type)

return new_node

# Private methods
#
def __add_write_node_commands(self, context=None):
"""
Creates write node menu entries for all write node configurations
and the convert to and from Shotgun write node actions if configured to do so.
"""
context = context or self.context

write_node_icon = os.path.join(self.disk_location, "resources", "tk2_write.png")

for profile_name in self.__write_node_handler.profile_names:
write_type = "Version"
profile_list = []
write_node_icon = os.path.join(self.disk_location, "resources", "tk2_write.png").replace("\\","/")

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing whitespace after ','

profile_set = set(self.__write_node_handler.profile_names)

# Remove fileset types nt associated with Project
if not self.__write_node_handler.proj_info['sg_delivery_fileset']:
nuke.tprint("No fileset specified. Loading defaults...")
profile_list = self.__write_node_handler.profile_names
else:
if any(self.__write_node_handler.proj_info['sg_delivery_fileset']['name'] in s.lower() for s in self.__write_node_handler.profile_names):
if context.step['name'] != 'Roto':
match_set = {"Jpeg", self.__write_node_handler.proj_info['sg_delivery_fileset']['name'].title()}
else:
nuke.tprint("Context is " + context.step['name'] + ".")
match_set = {"Jpeg", "Exr"}

profile_list = list(match_set.intersection(profile_set))
else:
nuke.tprint("Profile name not in list!")
profile_list = self.__write_node_handler.profile_names

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blank line contains whitespace

for profile_name in profile_list:
# add to toolbar menu
cb_fn = lambda pn=profile_name: self.__write_node_handler.create_new_node(pn)
cb_fn = lambda pn=profile_name,wt=write_type: self.__write_node_handler.create_new_node(pn,wt)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not assign a lambda expression, use a def
missing whitespace after ','

self.engine.register_command(
"%s [Shotgun]" % profile_name,
"%s" % profile_name,
cb_fn,
dict(
type="node",
icon=write_node_icon,
context=context,
icon=write_node_icon
)
)

Expand All @@ -302,7 +326,8 @@ def __add_write_node_commands(self, context=None):
# as these aren't supported when converting back
# todo: We should check the settings and then scan the scene to see if any SG write nodes use promoted knobs
write_nodes = self.get_setting("write_nodes")
promoted_knob_write_nodes = next((a_node for a_node in write_nodes if a_node['promote_write_knobs']), None)
if write_nodes:
promoted_knob_write_nodes = next((a_node for a_node in write_nodes if a_node['promote_write_knobs']), None)

if not promoted_knob_write_nodes:
# no presets use promoted knobs so we are OK to register the menus.
Expand Down
Loading