[Bf-blender-cvs] [57b378b046c] master: as discussed on IRC this definition seems to be not necessary
Gaia Clary
noreply at git.blender.org
Mon Feb 26 12:56:41 CET 2018
Commit: 57b378b046cf660b28d5095f9df9d1a913ebabc0
Author: Gaia Clary
Date: Mon Feb 26 12:09:29 2018 +0100
Branches: master
https://developer.blender.org/rB57b378b046cf660b28d5095f9df9d1a913ebabc0
as discussed on IRC this definition seems to be not necessary
===================================================================
M source/blender/makesrna/intern/rna_scene_api.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index 7d95fbf4068..3043e636b31 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -262,65 +262,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(
- Scene *scene,
- 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 export_texture_type,
- 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(scene,
- filepath,
-
- apply_modifiers,
- export_mesh_type,
-
- selected,
- include_children,
- include_armatures,
- include_shapekeys,
- deform_bones_only,
- sampling_rate,
-
- active_uv_only,
- export_texture_type,
- 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)
@@ -376,69 +317,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");
- 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_int(func, "export_texture_type", 0, INT_MIN, INT_MAX,
- "Texture Type", "Type for exported Textures (UV or MAT)", INT_MIN, INT_MAX);
-
- 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");
-
-#endif
-
#ifdef WITH_ALEMBIC
/* XXX Deprecated, will be removed in 2.8 in favour of calling the export operator. */
func = RNA_def_function(srna, "alembic_export", "rna_Scene_alembic_export");
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 85ed589dd78..880c866085d 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -146,7 +146,6 @@ struct wmWindowManager;
#include "../../intern/elbeem/extern/elbeem.h"
#include "../blender/blenkernel/BKE_modifier.h"
#include "../blender/blenkernel/BKE_paint.h"
-#include "../blender/collada/collada.h"
#include "../blender/compositor/COM_compositor.h"
#include "../blender/editors/include/ED_armature.h"
#include "../blender/editors/include/ED_anim_api.h"
@@ -726,34 +725,6 @@ struct uiLayout *uiLayoutRadial(struct uiLayout *layout) RET_NULL
int UI_pie_menu_invoke_from_operator_enum(struct bContext *C, const char *title, const char *opname,
const char *propname, const struct wmEvent *event) RET_ZERO
-/* RNA COLLADA dependency */
-/* XXX (gaia) Why do we need this declaration here? */
-/* The collada header is included anyways further up... */
-int collada_export(struct Scene *sce,
- const char *filepath,
- int apply_modifiers,
- BC_export_mesh_type 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,
- BC_export_texture_type export_texture_type,
- int use_texture_copies,
-
- int triangulate,
- int use_object_instantiation,
- int use_blender_profile,
- int sort_by_name,
- BC_export_transformation_type export_transformation_type,
- int open_sim,
- int limit_precision,
- int keep_bind_info) RET_ZERO
-
void ED_mesh_calc_tessface(struct Mesh *mesh, bool free_mpoly) RET_NONE
/* bpy/python internal api */
More information about the Bf-blender-cvs
mailing list