From 4e25de776a09e9d6bb6ccac9e935c32ea0952d95 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 11 Jul 2017 19:35:28 +0200 Subject: Fix T52029: Blender 2.78a doesn't import user properties from FBX file. Customprop handling helper was called with wrong data for objects and bones. Many thanks to Nik S (@proteamer) for spotting the issue, investigating it and finding the solution! --- io_scene_fbx/__init__.py | 2 +- io_scene_fbx/import_fbx.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'io_scene_fbx') diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 039e7952..a3cb049e 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (3, 7, 11), + "version": (3, 7, 12), "blender": (2, 77, 0), "location": "File > Import-Export", "description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions", diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index 543615d6..49af2308 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -1923,7 +1923,7 @@ class FbxImportHelperNode: obj.matrix_basis = self.get_matrix() if settings.use_custom_props: - blen_read_custom_properties(fbx_props[0], obj, settings) + blen_read_custom_properties(self.fbx_elem, obj, settings) return obj @@ -2072,7 +2072,7 @@ class FbxImportHelperNode: assert(fbx_props[0] is not None) if settings.use_custom_props: - blen_read_custom_properties(fbx_props[0], arm, settings) + blen_read_custom_properties(self.fbx_elem, arm, settings) # instance in scene obj_base = scene.objects.link(arm) -- cgit v1.2.3