blender/blender-addons-contrib
Archived
3
11
Fork 17
Code Pull Requests 3 Activity

io_scene_3ds: Update for Blender 3.x #2

Merged
Sebastian Sille merged 34 commits from blender-v3.5-release into blender-v3.1-release 2023-02-17 22:45:58 +01:00
Conversation 0 Commits 34 Files Changed 37 +8 -11
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14365d76b0 - Show all commits

19
io_export_after_effects.py
View File

@ -36,7 +36,7 @@ bl_info = {
import bpy import bpy
import os import os
import datetime import datetime
from math import degrees, floor from math import degrees
from mathutils import Matrix, Vector, Color from mathutils import Matrix, Vector, Color
@ -350,11 +350,10 @@ def get_selected(context, include_active_cam, include_selected_cams,
and obj is context.scene.camera): and obj is context.scene.camera):
# Ignore active camera if already selected # Ignore active camera if already selected
continue continue
else: if include_selected_cams:
if include_selected_cams: cameras.append(CameraExport(obj))
cameras.append(CameraExport(obj)) if include_cam_bundles:
if include_cam_bundles: cam_bundles.extend(get_camera_bundles(context.scene, obj))
cam_bundles.extend(get_camera_bundles(context.scene, obj))
elif include_image_planes and is_image_plane(obj): elif include_image_planes and is_image_plane(obj):
images.append(ImageExport(obj)) images.append(ImageExport(obj))
@ -444,7 +443,7 @@ def is_image_plane(obj):
if not is_plane(obj): if not is_plane(obj):
return False return False
if not len(obj.material_slots): if len(obj.material_slots) == 0:
return False return False
mat = get_first_material(obj) mat = get_first_material(obj)
@ -535,8 +534,6 @@ def convert_transform_matrix(matrix, width, height, aspect,
This function will be called for every object for every frame This function will be called for every object for every frame
""" """
scale_mat = Matrix.Scale(width, 4)
# Get blender transform data for object # Get blender transform data for object
b_loc = matrix.to_translation() b_loc = matrix.to_translation()
b_rot = matrix.to_euler('ZYX') # ZYX euler matches AE's orientation and allows to use x_rot_correction b_rot = matrix.to_euler('ZYX') # ZYX euler matches AE's orientation and allows to use x_rot_correction
@ -695,8 +692,8 @@ def write_jsx_file(context, file, selection, include_animation, ae_size):
jsx_file.write(f'Duration : {duration}\n') jsx_file.write(f'Duration : {duration}\n')
jsx_file.write(f'FPS : {fps}\n') jsx_file.write(f'FPS : {fps}\n')
jsx_file.write(f'Date : {datetime.datetime.now()}\n') jsx_file.write(f'Date : {datetime.datetime.now()}\n')
jsx_file.write(f'Exported with io_export_after_effects.py\n') jsx_file.write('Exported with io_export_after_effects.py\n')
jsx_file.write(f'**************************************/\n\n\n\n') jsx_file.write('**************************************/\n\n\n\n')
# Wrap in function # Wrap in function
jsx_file.write("function compFromBlender(){\n") jsx_file.write("function compFromBlender(){\n")