diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-27 00:49:30 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-27 00:49:30 +0300 |
commit | f228a08d027ef700344d35f1ba958249afa93222 (patch) | |
tree | fc6c60d89f911bcb0c5019e2e6e4243e49cba9af /source/blender/makesrna | |
parent | e94276d4033c72000942a49100e552e800d09e58 (diff) | |
parent | 7dd0e36dc4582e57a3f5235f384b5207882c923e (diff) |
merge from master
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 580b4d34106..212578cf3f0 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -290,65 +290,6 @@ static void rna_Scene_alembic_export( #endif -#ifdef WITH_COLLADA -/* don't remove this, as COLLADA exporting cannot be done through operators in render() callback. */ -#include "../../collada/collada.h" - -/* Note: This definition must match to the generated function call */ -static void rna_Scene_collada_export( - bContext *C, - const char *filepath, - int apply_modifiers, - - int export_mesh_type, - int selected, - int include_children, - int include_armatures, - int include_shapekeys, - int deform_bones_only, - int sampling_rate, - int active_uv_only, - int include_material_textures, - int use_texture_copies, - int triangulate, - int use_object_instantiation, - int use_blender_profile, - int sort_by_name, - int export_transformation_type, - int open_sim, - int limit_precision, - int keep_bind_info) -{ - collada_export(C, - filepath, - - apply_modifiers, - export_mesh_type, - - selected, - include_children, - include_armatures, - include_shapekeys, - deform_bones_only, - sampling_rate, - - active_uv_only, - include_material_textures, - use_texture_copies, - - triangulate, - use_object_instantiation, - use_blender_profile, - sort_by_name, - - export_transformation_type, - open_sim, - limit_precision, - keep_bind_info); -} - -#endif - #else void RNA_api_scene(StructRNA *srna) @@ -407,71 +348,6 @@ void RNA_api_scene(StructRNA *srna) parm = RNA_def_float_matrix(func, "matrix", 4, 4, NULL, 0.0f, 0.0f, "", "Matrix", 0.0f, 0.0f); RNA_def_function_output(func, parm); -#ifdef WITH_COLLADA - /* don't remove this, as COLLADA exporting cannot be done through operators in render() callback. */ - func = RNA_def_function(srna, "collada_export", "rna_Scene_collada_export"); - RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT); - parm = RNA_def_string(func, "filepath", NULL, FILE_MAX, "File Path", "File path to write Collada file"); - RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - RNA_def_property_subtype(parm, PROP_FILEPATH); /* allow non utf8 */ - - RNA_def_boolean(func, "apply_modifiers", false, - "Apply Modifiers", "Apply modifiers to exported mesh (non destructive))"); - - RNA_def_int(func, "export_mesh_type", 0, INT_MIN, INT_MAX, - "Resolution", "Modifier resolution for export", INT_MIN, INT_MAX); - - RNA_def_boolean(func, "selected", false, "Selection Only", "Export only selected elements"); - - RNA_def_boolean(func, "include_children", false, - "Include Children", "Export all children of selected objects (even if not selected)"); - - RNA_def_boolean(func, "include_armatures", false, - "Include Armatures", "Export related armatures (even if not selected)"); - - RNA_def_boolean(func, "include_shapekeys", true, "Include Shape Keys", "Export all Shape Keys from Mesh Objects"); - - RNA_def_boolean(func, "deform_bones_only", false, - "Deform Bones only", "Only export deforming bones with armatures"); - - RNA_def_int(func, "sampling_rate", 0, -1, INT_MAX, - "Samplintg Rate", "The maximum distance of frames between 2 keyframes. Disabled when value is -1", -1, INT_MAX); - - RNA_def_boolean(func, "active_uv_only", false, "Only Selected UV Map", "Export only the selected UV Map"); - - RNA_def_boolean(func, "include_material_textures", false, - "Include Material Textures", "Export textures assigned to the object Materials"); - - RNA_def_boolean(func, "use_texture_copies", true, - "Copy", "Copy textures to same folder where the .dae file is exported"); - - RNA_def_boolean(func, "triangulate", true, "Triangulate", "Export Polygons (Quads & NGons) as Triangles"); - - RNA_def_boolean(func, "use_object_instantiation", true, - "Use Object Instances", "Instantiate multiple Objects from same Data"); - - RNA_def_boolean(func, "use_blender_profile", true, "Use Blender Profile", - "Export additional Blender specific information (for material, shaders, bones, etc.)"); - - RNA_def_boolean(func, "sort_by_name", false, "Sort by Object name", "Sort exported data by Object name"); - - RNA_def_int(func, "export_transformation_type", 0, INT_MIN, INT_MAX, - "Transform", "Transformation type for translation, scale and rotation", INT_MIN, INT_MAX); - - RNA_def_boolean(func, "open_sim", false, - "Export to SL/OpenSim", "Compatibility mode for SL, OpenSim and other compatible online worlds"); - - RNA_def_boolean(func, "limit_precision", false, - "Limit Precision", - "Reduce the precision of the exported data to 6 digits"); - - RNA_def_boolean(func, "keep_bind_info", false, - "Keep Bind Info", - "Store bind pose information in custom bone properties for later use during Collada export"); - - RNA_def_function_flag(func, FUNC_USE_CONTEXT); - -#endif #ifdef WITH_ALEMBIC /* XXX Deprecated, will be removed in 2.8 in favour of calling the export operator. */ |