Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2020-01-24 19:06:12 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2020-01-24 19:09:45 +0300
commit5352ac7e842ff9085b1b6e111b5b67384365135f (patch)
treec5a3d6c9de7809ded555c2108a68577a73805289 /io_scene_fbx/import_fbx.py
parent96e3c6f25dd25aed234943eb25ab255399598865 (diff)
Revert "FBX Import: corrected import camera. Added setting camera (invert or not invert)."
While it's nice to see attempts to fix cameras (their orientations are know broken in some case for ages), this commit has several issues: - It did not get any review. - It changes default behavior. - It adds yet another parameter. - It does not actually fixes anything, nor does it explain anything. The first two points in particular are red lights. But the last two are also more and more annoying, unless someone can provide a good, valid understanding of how camera orientation is supposed to work in FBX, am fairly not keen on accepting any more hack like that. This is just adding more parameters that users just don’t understand, and which generates by themselves even more bug reports. This reverts commit 9eddf664d68a2ed6be1bf17b0b26d6d66d81c0eb.
Diffstat (limited to 'io_scene_fbx/import_fbx.py')
-rw-r--r--io_scene_fbx/import_fbx.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index e6918e40..32b887c1 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -61,7 +61,7 @@ convert_deg_to_rad_iter = units_convertor_iter("degree", "radian")
MAT_CONVERT_BONE = fbx_utils.MAT_CONVERT_BONE.inverted()
MAT_CONVERT_LIGHT = fbx_utils.MAT_CONVERT_LIGHT.inverted()
-MAT_CONVERT_CAMERA = fbx_utils.MAT_CONVERT_CAMERA
+MAT_CONVERT_CAMERA = fbx_utils.MAT_CONVERT_CAMERA.inverted()
def validate_blend_names(name):
@@ -1769,10 +1769,7 @@ class FbxImportHelperNode:
else:
# camera and light can be hard wired
if self.fbx_type == b'Camera':
- if settings.camera_invert:
- correction_matrix = MAT_CONVERT_CAMERA.inverted()
- else:
- correction_matrix = MAT_CONVERT_CAMERA
+ correction_matrix = MAT_CONVERT_CAMERA
elif self.fbx_type == b'Light':
correction_matrix = MAT_CONVERT_LIGHT
@@ -2330,9 +2327,7 @@ def load(operator, context, filepath="",
automatic_bone_orientation=False,
primary_bone_axis='Y',
secondary_bone_axis='X',
- use_prepost_rot=True,
- camera_invert=False,
- ):
+ use_prepost_rot=True):
global fbx_elem_nil
fbx_elem_nil = FBXElem('', (), (), ())
@@ -2472,7 +2467,6 @@ def load(operator, context, filepath="",
nodal_material_wrap_map, image_cache,
ignore_leaf_bones, force_connect_children, automatic_bone_orientation, bone_correction_matrix,
use_prepost_rot,
- camera_invert,
)
# #### And now, the "real" data.