Merge branch '1-0-3-Beta' into master-2

modules/maya_warpper.py

@@ -247,9 +247,17 @@ def playblast(path = None,format = None, compression = None, hud = None, offscre
             end  = cmds.playbackOptions( q=True,max=True )
             range = [start, end]
 
-    cmds.playblast(startTime =range[0] ,endTime =range[1], f = path, fmt=format,  orn=hud, os=offscreen, wh = scene_resolution(), p=scale, qlt=90,c=compression, v=True) 
+    cmds.playblast(startTime =range[0] ,endTime =range[1], f = path, fmt=format,  orn=hud, os=offscreen, wh = scene_resolution(), p=scale, qlt=90,c=compression, v=True, s = qeury_active_sound_node())
 
 
+def qeury_active_sound_node():
+    aPlayBackSliderPython = mel.eval('$tmpVar=$gPlayBackSlider')
+    sound = cmds.timeControl(aPlayBackSliderPython, q=1, s=1)
+    if sound:
+        return sound
+    else:
+        return None
+
 def playback_selection_range():
     aPlayBackSliderPython = mel.eval('$tmpVar=$gPlayBackSlider')
     time_selection = cmds.timeControl( aPlayBackSliderPython, q=True,rng=True )[1:-1]

pipeline.py

@@ -2683,7 +2683,9 @@ def set_icons(self):
         self.ui.import_shot_version_pushButton.setIcon(QtGui.QIcon(import_icon))
         self.ui.export_shot_pushButton.setIcon(QtGui.QIcon(export_icon))
         self.ui.playblast_shot_pushButton.setIcon(QtGui.QIcon(camrea_icon))
-
+
+        self.ui.export_shot_pushButton.setHidden(True)
+
         self.ui.comp_icon_label.setPixmap(new_icon.scaled(16,16))
         self.ui.comp_user_label.setPixmap(users_icon.scaled(16,16))
         self.ui.comp_note_label.setPixmap(edit_icon.scaled(16,16))        
@@ -5538,8 +5540,9 @@ def run2017():
             workspaceControlName = self.objectName() + 'WorkspaceControl'
             self.deleteControl(workspaceControlName)
             self.show(dockable=True, area='right', floating=False )
-            cmds.workspaceControl(workspaceControlName, e=True, ttc=["AttributeEditor",-1], wp="preferred")
+            cmds.workspaceControl(workspaceControlName, e=True, ttc=["AttributeEditor",-1], wp="preferred", mw=420)
             self.raise_()
+            self.setMinimumWidth(420)
             self.setDockableParameters(width=420)