Skip to content
This repository has been archived by the owner on Jul 8, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into blender_28
Browse files Browse the repository at this point in the history
  • Loading branch information
SE2Dev committed Oct 29, 2020
2 parents 5499671 + a2d8dea commit 3581a99
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
bl_info = {
"name": "SEAnim Support",
"author": "SE2Dev",
"version": (0, 4, 0),
"version": (0, 4, 1),
"blender": (2, 80, 0),
"location": "File > Import",
"description": "Import SEAnim",
Expand Down Expand Up @@ -46,12 +46,12 @@ class ImportSEAnim(bpy.types.Operator, ImportHelper):
def execute(self, context):
# print("Selected: " + context.active_object.name)
from . import import_seanim
start_time = time.clock()
start_time = time.process_time()
result = import_seanim.load(
self, context, **self.as_keywords(ignore=("filter_glob", "files")))
if not result:
self.report({'INFO'}, "Import finished in %.4f sec." %
(time.clock() - start_time))
(time.process_time() - start_time))
return {'FINISHED'}
else:
self.report({'ERROR'}, result)
Expand Down Expand Up @@ -160,11 +160,11 @@ def draw(self, context):
def execute(self, context):
# print("Selected: " + context.active_object.name)
from . import export_seanim
start_time = time.clock()
start_time = time.process_time()
result = export_seanim.save(self, context)
if not result:
self.report({'INFO'}, "Export finished in %.4f sec." %
(time.clock() - start_time))
(time.process_time() - start_time))
return {'FINISHED'}
else:
self.report({'ERROR'}, result)
Expand Down

0 comments on commit 3581a99

Please sign in to comment.