|
@@ -347,7 +347,7 @@ def createSceneControlUI():
|
347
|
347
|
# User Short
|
348
|
348
|
k = nuke.String_Knob('user', 'User')
|
349
|
349
|
n.addKnob(k)
|
350
|
|
- k.setTooltip('User Short. Reading Env Variable: USER')
|
|
350
|
+ k.setTooltip('User Short. Reading Env Variable: USER_SHORT')
|
351
|
351
|
n.knob('user').setValue(user)
|
352
|
352
|
n.knob('user').clearFlag(nuke.STARTLINE)
|
353
|
353
|
|
|
@@ -508,7 +508,7 @@ def initSceneControlValues(sceneControl):
|
508
|
508
|
k['project'].setValue(proj)
|
509
|
509
|
|
510
|
510
|
try:
|
511
|
|
- k['user'].setValue(checkEnvEntry('USER'))
|
|
511
|
+ k['user'].setValue(checkEnvEntry('USER_SHORT'))
|
512
|
512
|
except:
|
513
|
513
|
print('SceneControl: Warning. Please enter your shortname.')
|
514
|
514
|
|
|
@@ -705,14 +705,14 @@ def kenvQuery(query , **kwargs):
|
705
|
705
|
print('MINOR_VERSION: ' + str(int(minor_version)))
|
706
|
706
|
print('ELEMENT: ' + elementstr)
|
707
|
707
|
print('INFO: ' + infostr)
|
708
|
|
- print('USER: ' + user)
|
|
708
|
+ print('USER_SHORT: ' + user)
|
709
|
709
|
print('EXT: ' + ext)
|
710
|
710
|
print('APP_ID: ' + app_id)
|
711
|
711
|
# KEnv
|
712
|
712
|
if minor_version is None:
|
713
|
|
- result = nuke.kenv.get(query, PROJECT=project, DEPT=dept, SEQUENCE=sequence, SHOT=shot, ELEMENT=element, TASK=task, MAJOR_VERSION=int(major_version), INFO=info, EXT=ext, USER=user, APP_ID=app_id, USE_ENV_PROJECTROOT=useEnv)
|
|
713
|
+ result = nuke.kenv.get(query, PROJECT=project, DEPT=dept, SEQUENCE=sequence, SHOT=shot, ELEMENT=element, TASK=task, MAJOR_VERSION=int(major_version), INFO=info, EXT=ext, USER_SHORT=user, APP_ID=app_id, USE_ENV_PROJECTROOT=useEnv)
|
714
|
714
|
else:
|
715
|
|
- result = nuke.kenv.get(query, PROJECT=project, DEPT=dept, SEQUENCE=sequence, SHOT=shot, ELEMENT=element, TASK=task, MAJOR_VERSION=int(major_version), MINOR_VERSION=int(minor_version), INFO=info, EXT=ext, USER=user, APP_ID=app_id, USE_ENV_PROJECTROOT=useEnv)
|
|
715
|
+ result = nuke.kenv.get(query, PROJECT=project, DEPT=dept, SEQUENCE=sequence, SHOT=shot, ELEMENT=element, TASK=task, MAJOR_VERSION=int(major_version), MINOR_VERSION=int(minor_version), INFO=info, EXT=ext, USER_SHORT=user, APP_ID=app_id, USE_ENV_PROJECTROOT=useEnv)
|
716
|
716
|
if debug:
|
717
|
717
|
print('SceneControl: Debug kenv query: ' + result)
|
718
|
718
|
return result
|
|
@@ -1146,6 +1146,7 @@ def createCustomWrite(n):
|
1146
|
1146
|
# ignore
|
1147
|
1147
|
k = nuke.Boolean_Knob('ignore', 'ignore in sceneControl')
|
1148
|
1148
|
n.addKnob(k)
|
|
1149
|
+ n.knob('ignore').setTooltip('If enabled sceneControl will NOT change any configuration of this write node such as Filepath, Version etc.')
|
1149
|
1150
|
n.knob('ignore').setValue(0)
|
1150
|
1151
|
|
1151
|
1152
|
# _______________________________________________________________
|
|
@@ -1972,12 +1973,13 @@ def debugQuery():
|
1972
|
1973
|
print('MINOR_VERSION: ' + str(int(k['minor_version'].value())))
|
1973
|
1974
|
print('ELEMENT: ' + element)
|
1974
|
1975
|
print('INFO: ' + info)
|
1975
|
|
- print('USER: ' + k['user'].value())
|
|
1976
|
+ print('USER_SHORT: ' + k['user'].value())
|
1976
|
1977
|
print('EXT: exr')
|
1977
|
1978
|
print('APP_ID: nuke')
|
1978
|
1979
|
return
|
1979
|
1980
|
|
1980
|
1981
|
|
|
1982
|
+
|
1981
|
1983
|
# deprecated
|
1982
|
1984
|
def load_precomp():
|
1983
|
1985
|
major = nuke.thisNode().knob("major_version").getValue()
|