[Bf-blender-cvs] [3ee05d19fbe] collada: refactor: Collada added get methods for BlenderContext info to ExportSettings

[Gaia Clary]

Commit: 3ee05d19fbebd9043ce409c292c3a5ab764316e5
Author: Gaia Clary
Date:   Sat Apr 6 20:10:39 2019 +0200
Branches: collada
https://developer.blender.org/rB3ee05d19fbebd9043ce409c292c3a5ab764316e5

refactor: Collada added get methods for BlenderContext info to ExportSettings

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

M	source/blender/collada/DocumentExporter.cpp
M	source/blender/collada/ExportSettings.h

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

diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index b2c5d1b10a0..a39527db128 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -147,7 +147,7 @@ char *bc_CustomData_get_active_layer_name(const CustomData *data, int type)
 
 DocumentExporter::DocumentExporter(BlenderContext &blender_context, ExportSettings *exportSettings) :
 	blender_context(blender_context),
-	export_settings(BCExportSettings(exportSettings)) {
+	export_settings(BCExportSettings(exportSettings, blender_context)) {
 }
 
 static COLLADABU::NativeString make_temp_filepath(const char *name, const char *extension)
diff --git a/source/blender/collada/ExportSettings.h b/source/blender/collada/ExportSettings.h
index 4830ad495b2..c3535e09031 100644
--- a/source/blender/collada/ExportSettings.h
+++ b/source/blender/collada/ExportSettings.h
@@ -90,17 +90,23 @@ typedef struct ExportSettings {
 	LinkNode *export_set;
 } ExportSettings;
 
+ bool bc_is_base_node(LinkNode *export_set, Object *ob);
+
 #ifdef __cplusplus
 }
 
 class BCExportSettings
 {
+
 private:
 	const ExportSettings &export_settings;
+	BlenderContext &blender_context;
 
 public:
-	BCExportSettings(ExportSettings *exportSettings) :
-		export_settings(*exportSettings)
+
+	BCExportSettings(ExportSettings *exportSettings, BlenderContext &blenderContext) :
+		export_settings(*exportSettings),
+		blender_context(blenderContext)
 	{}
 
 	bool get_apply_modifiers()
@@ -112,10 +118,12 @@ public:
 	{
 		return export_settings.global_forward;
 	}
+
 	BC_global_up_axis get_global_up()
 	{
 		return export_settings.global_up;
 	}
+
 	bool get_apply_global_orientation()
 	{
 		return export_settings.apply_global_orientation;
@@ -130,42 +138,52 @@ public:
 	{
 		return export_settings.selected;
 	}
+
 	bool get_include_children()
 	{
 		return export_settings.include_children;
 	}
+
 	bool get_include_armatures()
 	{
 		return export_settings.include_armatures;
 	}
+
 	bool get_include_shapekeys()
 	{
 		return export_settings.include_shapekeys;
 	}
+
 	bool get_deform_bones_only()
 	{
 		return export_settings.deform_bones_only;
 	}
+
 	bool get_include_animations()
 	{
 		return export_settings.include_animations;
 	}
+
 	bool get_include_all_actions()
 	{
 		return export_settings.include_all_actions;
 	}
+
 	int  get_sampling_rate()
 	{
 		return export_settings.sampling_rate;
 	}
+
 	bool get_keep_smooth_curves()
 	{
 		return export_settings.keep_smooth_curves;
 	}
+
 	bool get_keep_keyframes()
 	{
 		return export_settings.keep_keyframes;
 	}
+
 	bool get_keep_flat_curves()
 	{
 		return export_settings.keep_flat_curves;
@@ -175,10 +193,12 @@ public:
 	{
 		return export_settings.active_uv_only;
 	}
+
 	BC_export_animation_type get_export_animation_type()
 	{
 		return export_settings.export_animation_type;
 	}
+
 	bool get_use_texture_copies()
 	{
 		return export_settings.use_texture_copies;
@@ -188,18 +208,22 @@ public:
 	{
 		return export_settings.triangulate;
 	}
+
 	bool get_use_object_instantiation()
 	{
 		return export_settings.use_object_instantiation;
 	}
+
 	bool get_use_blender_profile()
 	{
 		return export_settings.use_blender_profile;
 	}
+
 	bool get_sort_by_name()
 	{
 		return export_settings.sort_by_name;
 	}
+
 	BC_export_transformation_type get_export_transformation_type()
 	{
 		return export_settings.export_transformation_type;
@@ -209,10 +233,12 @@ public:
 	{
 		return export_settings.open_sim;
 	}
+
 	bool get_limit_precision()
 	{
 		return export_settings.limit_precision;
 	}
+
 	bool get_keep_bind_info()
 	{
 		return export_settings.keep_bind_info;
@@ -222,11 +248,22 @@ public:
 	{
 		return export_settings.filepath;
 	}
+
 	LinkNode *get_export_set()
 	{
 		return export_settings.export_set;
 	}
 
+	ViewLayer *get_view_layer()
+	{
+		return blender_context.get_view_layer();
+	}
+
+	bool is_export_root(Object *ob)
+	{
+		return bc_is_base_node(get_export_set(), ob);
+	}
+
 };
 
 #endif