Skip to content

Commit

Permalink
Merge pull request #11 from liorbenhorin/working
Browse files Browse the repository at this point in the history
timeSlider_patch
  • Loading branch information
liorbenhorin committed May 26, 2016
2 parents 5fffd81 + afb5d1c commit 748d38d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
6 changes: 5 additions & 1 deletion modules/maya_warpper.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@
def new_scene():
checkState()
return cmds.file(new=True, f=True)


def rewind():
cmds.currentTime(1)
cmds.playbackOptions(minTime=1)


def save_scene_as(path = None, file_name = None):
if os.path.exists(path):
Expand Down
12 changes: 9 additions & 3 deletions pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@ def create(self, path, catagory_name, asset_name, component_name, project, setti
if not create_from:
maya.new_scene()
maya.set_fps(self.project.project_fps)
maya.rewind()

elif create_from == "current_scene":
pass

Expand Down Expand Up @@ -742,6 +744,8 @@ def create(self, path, sequence_name, shot_name, project, settings, create_from)
if not create_from:
maya.new_scene()
maya.set_fps(self.project.project_fps)
maya.rewind()

elif create_from == "current_scene":
pass

Expand Down Expand Up @@ -1579,7 +1583,7 @@ def __init__(self, parent=None):
self.ui.users_pushButton.setText(self.settings.user[0])
else:
self.ui.users_pushButton.setText("Not logged In")
self.unload_project()
#self.unload_project()
#maya.viewMassage("No user is logged in")


Expand Down Expand Up @@ -1751,7 +1755,6 @@ def set_project(self):


else:

return True


Expand Down Expand Up @@ -3594,7 +3597,10 @@ def master_make_master(self):

if dlg.warning("critical", "Delete", "Are you sure you want to make this version the master?" ):
if maya.current_open_file() == self.component.master:
maya.new_scene()
maya.new_scene()
maya.set_fps(self.project.project_fps)
maya.rewind()

self.component.make_master(version)
maya.open_scene(self.component.master)
self.update_masters()
Expand Down

0 comments on commit 748d38d

Please sign in to comment.