Skip to content

Commit a6cb012

Browse files
author
RichardFrangenberg
committed
Blender taskname fix, shotgun sync fix - v1.3.0.81
1 parent 71d8e4b commit a6cb012

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

Prism/Plugins/Apps/Blender/Scripts/Prism_Blender_Functions.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -397,11 +397,6 @@ def sm_export_startup(self, origin):
397397
@err_catcher(name=__name__)
398398
def sm_export_setTaskText(self, origin, prevTaskName, newTaskName):
399399
setName = newTaskName
400-
extension = 1
401-
while setName in self.getGroups() and extension < 999:
402-
if "%s_%s" % (setName, extension) not in self.getGroups():
403-
setName += "_%s" % extension
404-
extension += 1
405400

406401
if prevTaskName and prevTaskName in self.getGroups():
407402
self.getGroups()[prevTaskName].name = setName

Prism/Plugins/ProjectManagers/Shotgun/Scripts/Prism_Shotgun_Functions.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ def sgShotsToLocal(self, origin):
956956
response = requests.get(shotData["image"])
957957

958958
with open(shotImgPath, "wb") as prvImg:
959-
prvImg.write(response.read())
959+
prvImg.write(response.content)
960960

961961
if (
962962
shotName not in createdShots
@@ -1170,14 +1170,17 @@ def sgShotsToSG(self, origin):
11701170
pass
11711171

11721172
if len(data.keys()) > 1 or shotImg != "":
1173-
result = sg.update("Shot", sgShots[shot[0]]["id"], data)
1174-
if (
1175-
[shot[1], shot[2]]
1176-
not in [[x["code"], x["sg_sequence"]] for x in createdShots]
1177-
and shot[0] not in updatedShots
1178-
and (len(data.keys()) > 1 or sgShots[shot[0]]["image"] is None)
1179-
):
1180-
updatedShots.append(shot[0])
1173+
try:
1174+
result = sg.update("Shot", sgShots[shot[0]]["id"], data)
1175+
if (
1176+
[shot[1], shot[2]]
1177+
not in [[x["code"], x["sg_sequence"]] for x in createdShots]
1178+
and shot[0] not in updatedShots
1179+
and (len(data.keys()) > 1 or sgShots[shot[0]]["image"] is None)
1180+
):
1181+
updatedShots.append(shot[0])
1182+
except:
1183+
print("failed to update shot: %s" % shot[0])
11811184

11821185
shotSteps = []
11831186
stepsPath = self.core.getEntityPath(entity="step", shot=shot[0])

Prism/Scripts/PrismCore.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def __init__(self, app="Standalone", prismArgs=[]):
183183

184184
try:
185185
# set some general variables
186-
self.version = "v1.3.0.80"
186+
self.version = "v1.3.0.81"
187187
self.requiredLibraries = "v1.3.0.0"
188188
self.core = self
189189

changelog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v1.3.0.81:
2+
- fixed a bug that tasknames on Blender export states incremented when reloading the state
3+
- fixed some errors when syncing shot preview images with Shotgun
4+
15
v1.3.0.80:
26
- added support for Maya 2022
37
- added support for Nuke 13

0 commit comments

Comments
 (0)