blender/blender-addons
19
43
Fork 96
Code Issues 630 Pull Requests 27 Projects 1 Releases Wiki Activity

Merge branch 'blender-v3.6-release' #104736

Merged
Sebastian Sille merged 3 commits from blender-v3.6-release into main 2023-07-05 09:14:20 +02:00
Conversation 0 Commits 3 Files Changed 1 +1 -3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9b4dede1da - Show all commits

4
io_scene_3ds/import_3ds.py
View File

@ -593,7 +593,6 @@ def process_next_chunk(context, file, previous_chunk, imported_objects, CONSTRAI
def read_track_data(temp_chunk): def read_track_data(temp_chunk):
"""Trackflags 0x1, 0x2 and 0x3 are for looping. 0x8, 0x10 and 0x20 """Trackflags 0x1, 0x2 and 0x3 are for looping. 0x8, 0x10 and 0x20
locks the XYZ axes. 0x100, 0x200 and 0x400 unlinks the XYZ axes""" locks the XYZ axes. 0x100, 0x200 and 0x400 unlinks the XYZ axes"""
new_chunk.bytes_read += SZ_U_SHORT
temp_data = file.read(SZ_U_SHORT) temp_data = file.read(SZ_U_SHORT)
tflags = struct.unpack('<H', temp_data)[0] tflags = struct.unpack('<H', temp_data)[0]
new_chunk.bytes_read += SZ_U_SHORT new_chunk.bytes_read += SZ_U_SHORT
@ -622,8 +621,8 @@ def process_next_chunk(context, file, previous_chunk, imported_objects, CONSTRAI
return keyframe_data return keyframe_data
def read_track_angle(temp_chunk): def read_track_angle(temp_chunk):
new_chunk.bytes_read += SZ_U_SHORT * 5
temp_data = file.read(SZ_U_SHORT * 5) temp_data = file.read(SZ_U_SHORT * 5)
new_chunk.bytes_read += SZ_U_SHORT * 5
temp_data = file.read(SZ_U_INT) temp_data = file.read(SZ_U_INT)
nkeys = struct.unpack('<I', temp_data)[0] nkeys = struct.unpack('<I', temp_data)[0]
new_chunk.bytes_read += SZ_U_INT new_chunk.bytes_read += SZ_U_INT
@ -1159,7 +1158,6 @@ def process_next_chunk(context, file, previous_chunk, imported_objects, CONSTRAI
elif KEYFRAME and new_chunk.ID == ROT_TRACK_TAG and tracking == 'OBJECT': # Rotation elif KEYFRAME and new_chunk.ID == ROT_TRACK_TAG and tracking == 'OBJECT': # Rotation
keyframe_rotation = {} keyframe_rotation = {}
new_chunk.bytes_read += SZ_U_SHORT
temp_data = file.read(SZ_U_SHORT) temp_data = file.read(SZ_U_SHORT)
tflags = struct.unpack('<H', temp_data)[0] tflags = struct.unpack('<H', temp_data)[0]
new_chunk.bytes_read += SZ_U_SHORT new_chunk.bytes_read += SZ_U_SHORT