[Bf-extensions-cvs] [213b0b5f] blender-v2.79a-release: Add option to control FBX 'empty' type through a string custom property in Blender's empty.

[Bastien Montagne]

Commit: 213b0b5ff5d19468bf458915a6c78a406c97d619
Author: Bastien Montagne
Date:   Tue Oct 31 16:28:33 2017 +0100
Branches: blender-v2.79a-release
https://developer.blender.org/rBA213b0b5ff5d19468bf458915a6c78a406c97d619

Add option to control FBX 'empty' type through a string custom property in Blender's empty.

Based on https://developer.blender.org/D2279 by Pavel Křupala (@pavelkrupala), thanks.

Conflicts:
	io_scene_fbx/__init__.py

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

M	io_scene_fbx/export_fbx_bin.py

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

diff --git a/io_scene_fbx/export_fbx_bin.py b/io_scene_fbx/export_fbx_bin.py
index 6c60a165..10f0e535 100644
--- a/io_scene_fbx/export_fbx_bin.py
+++ b/io_scene_fbx/export_fbx_bin.py
@@ -553,13 +553,14 @@ def fbx_data_element_custom_properties(props, bid):
 
 def fbx_data_empty_elements(root, empty, scene_data):
     """
-    Write the Empty data block.
+    Write the Empty data block (you can control its FBX datatype with the 'fbx_type' string custom property).
     """
     empty_key = scene_data.data_empties[empty]
 
     null = elem_data_single_int64(root, b"NodeAttribute", get_fbx_uuid_from_key(empty_key))
     null.add_string(fbx_name_class(empty.name.encode(), b"NodeAttribute"))
-    null.add_string(b"Null")
+    val = empty.bdata.get('fbx_type', None)
+    null.add_string(val.encode() if val and isinstance(val, str) else b"Null")
 
     elem_data_single_string(null, b"TypeFlags", b"Null")