qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-06-01 17:12:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix frame merging for mdlv3 files.

Browse source 
v3 files have no name fields in the frames, so we need to store the
generated name.
This commit is contained in:
Bill Currie 2011-09-18 09:18:49 +09:00
parent ad8afec84c
commit dbb1df70b5
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/qfmdl/import_mdl.py
View file

@ -271,6 +271,8 @@ def make_shape_key(mdl, framenum, subframenum=0):
name = "%s_%d_%d" % (mdl.name, framenum, subframenum) name = "%s_%d_%d" % (mdl.name, framenum, subframenum)
if frame.name: if frame.name:
name = frame.name name = frame.name
else:
frame.name = name
frame.key = mdl.obj.shape_key_add(name) frame.key = mdl.obj.shape_key_add(name)
frame.key.value = 0.0 frame.key.value = 0.0
mdl.keys.append (frame.key) mdl.keys.append (frame.key)
@ -353,7 +355,7 @@ def build_actions(mdl):
def get_base(name): def get_base(name):
i = 0 i = 0
while name[i] not in "0123456789": while i < len(name) and name[i] not in "0123456789":
i += 1 i += 1
return name[:i] return name[:i]
@ -396,9 +398,9 @@ def import_mdl(operator, context, filepath):
bpy.context.scene.objects.active = mdl.obj bpy.context.scene.objects.active = mdl.obj
mdl.obj.select = True mdl.obj.select = True
setup_skins (mdl, uvs) setup_skins (mdl, uvs)
merge_frames(mdl)
if mdl.numframes > 1 or mdl.frames[0].type: if mdl.numframes > 1 or mdl.frames[0].type:
build_shape_keys(mdl) build_shape_keys(mdl)
merge_frames(mdl)
build_actions(mdl) build_actions(mdl)
mdl.mesh.update() mdl.mesh.update()