[Bf-extensions-cvs] [3c5d5fb] fbx_io_export_ignore_parents: Merge branch 'master' into fbx_io_export_ignore_parents

[Bastien Montagne]

Commit: 3c5d5fb1cad25d75df3a3a032e86a58957311fd2
Author: Bastien Montagne
Date:   Wed Feb 10 20:00:44 2016 +0100
Branches: fbx_io_export_ignore_parents
https://developer.blender.org/rBA3c5d5fb1cad25d75df3a3a032e86a58957311fd2

Merge branch 'master' into fbx_io_export_ignore_parents

Conflicts:
	io_scene_fbx/import_fbx.py

===================================================================



===================================================================

diff --cc io_scene_fbx/export_fbx_bin.py
index 3541683,d3aeee7..7247cae
--- a/io_scene_fbx/export_fbx_bin.py
+++ b/io_scene_fbx/export_fbx_bin.py
@@@ -2325,11 -2345,10 +2353,11 @@@ def fbx_data_from_scene(scene, settings
          templates[b"Camera"] = fbx_template_def_camera(scene, settings, nbr_users=len(data_cameras))
  
      if data_bones:
 -        templates[b"Bone"] = fbx_template_def_bone(scene, settings, nbr_users=len(data_bones))
 +        nbr_users = sum(1 for db in data_bones if not db.skip_export)
 +        templates[b"Bone"] = fbx_template_def_bone(scene, settings, nbr_users=nbr_users)
  
      if data_meshes:
-         nbr = len(data_meshes)
+         nbr = len({me_key for me_key, _me, _free in data_meshes.values()})
          if data_deformers_shape:
              nbr += sum(len(shapes[2]) for shapes in data_deformers_shape.values())
          templates[b"Geometry"] = fbx_template_def_geometry(scene, settings, nbr_users=nbr)