studio/blender-studio-tools
13
32
Fork 19
Code Issues 21 Pull Requests 4 Projects Releases 1 Activity

[Blender_Kitsu] Shot_Builder fix lighting task type #9

Merged
Nick Alberelli merged 2 commits from :fix/lighting-task-type into master 2023-04-17 19:09:07 +02:00
Conversation 0 Commits 2 Files Changed 1 +18 -10
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
blender_kitsu/shot_builder/operators.py
View File

@ -125,6 +125,9 @@ class SHOTBUILDER_OT_NewShotFile(bpy.types.Operator):
"""Running as Modal Event because functions within execute() function like """Running as Modal Event because functions within execute() function like
animation_workspace_delete_others() changed UI context that needs to be refreshed. animation_workspace_delete_others() changed UI context that needs to be refreshed.
https://docs.blender.org/api/current/info_gotcha.html#no-updates-after-changing-ui-context""" https://docs.blender.org/api/current/info_gotcha.html#no-updates-after-changing-ui-context"""
#TODO this is a hack, should be inherient to above builder
#TODO fix during refactor
if self.task_type == 'anim':
animation_workspace_vse_area_add(context) animation_workspace_vse_area_add(context)
self._add_vse_area = True self._add_vse_area = True
@ -162,10 +165,7 @@ class SHOTBUILDER_OT_NewShotFile(bpy.types.Operator):
{'ERROR'}, "Operator is not able to determine the project root directory. \nCheck project root directiory is configured in 'Blender Kitsu' addon preferences.") {'ERROR'}, "Operator is not able to determine the project root directory. \nCheck project root directiory is configured in 'Blender Kitsu' addon preferences.")
return {'CANCELLED'} return {'CANCELLED'}
if not addon_prefs.is_editorial_dir_valid:
self.report(
{'ERROR'}, "Shot builder is dependant on a valid editorial export path and file pattern. \nCheck Preferences, errors appear in console")
return {'CANCELLED'}
self.production_root = addon_prefs.project_root_dir self.production_root = addon_prefs.project_root_dir
self.production_name = project.name self.production_name = project.name
@ -191,6 +191,11 @@ class SHOTBUILDER_OT_NewShotFile(bpy.types.Operator):
return cast(Set[str], context.window_manager.invoke_props_dialog(self, width=400)) return cast(Set[str], context.window_manager.invoke_props_dialog(self, width=400))
def execute(self, context: bpy.types.Context) -> Set[str]: def execute(self, context: bpy.types.Context) -> Set[str]:
addon_prefs = bpy.context.preferences.addons["blender_kitsu"].preferences
if self.task_type == 'anim' and not addon_prefs.is_editorial_dir_valid:
self.report(
{'ERROR'}, "Shot builder is dependant on a valid editorial export path and file pattern. \nCheck Preferences, errors appear in console")
return {'CANCELLED'}
wm = context.window_manager wm = context.window_manager
self._timer = wm.event_timer_add(0.1, window=context.window) self._timer = wm.event_timer_add(0.1, window=context.window)
wm.modal_handler_add(self) wm.modal_handler_add(self)
@ -198,9 +203,9 @@ class SHOTBUILDER_OT_NewShotFile(bpy.types.Operator):
self.report( self.report(
{'ERROR'}, "Shot builder can only be started from the File menu. Shortcuts like CTRL-N don't work") {'ERROR'}, "Shot builder can only be started from the File menu. Shortcuts like CTRL-N don't work")
return {'CANCELLED'} return {'CANCELLED'}
if self._built_shot: if self._built_shot:
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}
addon_prefs = bpy.context.preferences.addons["blender_kitsu"].preferences
ensure_loaded_production(context) ensure_loaded_production(context)
production = get_active_production() production = get_active_production()
shot_builder = ShotBuilder( shot_builder = ShotBuilder(
@ -212,6 +217,9 @@ class SHOTBUILDER_OT_NewShotFile(bpy.types.Operator):
sequence = gazu.shot.get_sequence_by_name(production.config['KITSU_PROJECT_ID'], self.seq_id) sequence = gazu.shot.get_sequence_by_name(production.config['KITSU_PROJECT_ID'], self.seq_id)
shot = gazu.shot.get_shot_by_name(sequence, self.shot_id) shot = gazu.shot.get_shot_by_name(sequence, self.shot_id)
#TODO this is a hack, should be inherient to above builder
#TODO fix during refactor
if self.task_type == 'anim':
#Load EDIT #Load EDIT
editorial_export_get_latest(context, shot) editorial_export_get_latest(context, shot)
# Load Anim Workspace # Load Anim Workspace