[Bf-blender-cvs] [6be2d53f6a9] collada: Removed const qualifier from EvaluationContext parameter and adjusted the class methods to reduce future merge conflicts in Blender2.8

[Gaia Clary]

Commit: 6be2d53f6a955e55c64646aa5a0d50d8c1fad3f4
Author: Gaia Clary
Date:   Wed Feb 28 18:10:59 2018 +0100
Branches: collada
https://developer.blender.org/rB6be2d53f6a955e55c64646aa5a0d50d8c1fad3f4

Removed const qualifier from EvaluationContext parameter and adjusted the class methods to reduce future merge conflicts in Blender2.8

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

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

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

diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h
index a739b2b6cbe..717a444fff9 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@ -84,12 +84,14 @@ extern "C"
 class AnimationExporter: COLLADASW::LibraryAnimations
 {
 private:
+	EvaluationContext * eval_ctx;
 	Scene *scene;
 	COLLADASW::StreamWriter *sw;
 
 public:
 
-	AnimationExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings):
+	AnimationExporter(EvaluationContext *eval_ctx, COLLADASW::StreamWriter *sw, const ExportSettings *export_settings):
+		eval_ctx(eval_ctx),
 		COLLADASW::LibraryAnimations(sw),
 		export_settings(export_settings)
 	{
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index d4eb6b477db..e2bbc781a12 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -154,7 +154,9 @@ char *bc_CustomData_get_active_layer_name(const CustomData *data, int type)
 	return bc_CustomData_get_layer_name(data, type, layer_index-1);
 }
 
-DocumentExporter::DocumentExporter(const ExportSettings *export_settings) : export_settings(export_settings) {
+DocumentExporter::DocumentExporter(EvaluationContext *eval_ctx, const ExportSettings *export_settings) :
+	eval_ctx(eval_ctx),
+	export_settings(export_settings) {
 }
 
 static COLLADABU::NativeString make_temp_filepath(const char *name, const char *extension)
@@ -181,7 +183,7 @@ static COLLADABU::NativeString make_temp_filepath(const char *name, const char *
 // COLLADA allows this through multiple <channel>s in <animation>.
 // For this to work, we need to know objects that use a certain action.
 
-int DocumentExporter::exportCurrentScene(const EvaluationContext *eval_ctx, Scene *sce)
+int DocumentExporter::exportCurrentScene(Scene *sce)
 {
 	PointerRNA sceneptr, unit_settings;
 	PropertyRNA *system; /* unused , *scale; */
@@ -304,7 +306,7 @@ int DocumentExporter::exportCurrentScene(const EvaluationContext *eval_ctx, Scen
 
 	if (this->export_settings->include_animations) {
 		// <library_animations>
-		AnimationExporter ae(writer, this->export_settings);
+		AnimationExporter ae(eval_ctx, writer, this->export_settings);
 		ae.exportAnimations(sce);
 	}
 	se.exportScene(sce);
diff --git a/source/blender/collada/DocumentExporter.h b/source/blender/collada/DocumentExporter.h
index 60e5deb0e31..9492012c0bf 100644
--- a/source/blender/collada/DocumentExporter.h
+++ b/source/blender/collada/DocumentExporter.h
@@ -39,11 +39,12 @@ struct Scene;
 class DocumentExporter
 {
  public:
-	DocumentExporter(const ExportSettings *export_settings);
-	int  exportCurrentScene(const EvaluationContext *eval_ctx, Scene *sce);
+	DocumentExporter(EvaluationContext *eval_ctx, const ExportSettings *export_settings);
+	int  exportCurrentScene(Scene *sce);
 	void exportScenes(const char *filename);
 private:
 	const ExportSettings *export_settings;
+	EvaluationContext *eval_ctx;
 };
 
 #endif
diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp
index 3794b6aefac..8db2de6ba87 100644
--- a/source/blender/collada/collada.cpp
+++ b/source/blender/collada/collada.cpp
@@ -74,8 +74,8 @@ int collada_export(EvaluationContext *eval_ctx,
 			bc_bubble_sort_by_Object_name(export_settings->export_set);
 	}
 
-	DocumentExporter exporter(export_settings);
-	int status = exporter.exportCurrentScene(eval_ctx, sce);
+	DocumentExporter exporter(eval_ctx, export_settings);
+	int status = exporter.exportCurrentScene(sce);
 
 	BLI_linklist_free(export_settings->export_set, NULL);