[Bf-blender-cvs] [87b24442704] blender2.8: Merge branch 'master' into blender2.8

Bastien Montagne noreply at git.blender.org
Thu Jun 14 15:56:12 CEST 2018


Commit: 87b2444270403b9a826f564ddf58a310dcab2324
Author: Bastien Montagne
Date:   Thu Jun 14 15:55:51 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB87b2444270403b9a826f564ddf58a310dcab2324

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/collada/AnimationExporter.cpp
	source/blender/collada/AnimationExporter.h
	source/blender/collada/ArmatureImporter.cpp
	source/blender/collada/ArmatureImporter.h
	source/blender/collada/ControllerExporter.cpp
	source/blender/collada/ControllerExporter.h
	source/blender/collada/DocumentExporter.cpp
	source/blender/collada/DocumentImporter.cpp
	source/blender/collada/GeometryExporter.cpp
	source/blender/collada/GeometryExporter.h
	source/blender/collada/MeshImporter.cpp
	source/blender/collada/MeshImporter.h
	source/blender/collada/SkinInfo.cpp
	source/blender/collada/SkinInfo.h
	source/blender/collada/collada_utils.cpp
	source/blender/collada/collada_utils.h

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



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

diff --cc source/blender/collada/AnimationExporter.cpp
index 95298986f5a,48656d15769..ab53e282476
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@@ -214,7 -215,7 +215,7 @@@ void AnimationExporter::export_sampled_
  	for (std::vector<float>::iterator ctime = ctimes.begin(); ctime != ctimes.end(); ++ctime) {
  		float fmat[4][4];
  
- 		bc_update_scene(depsgraph, scene, *ctime);
 -		bc_update_scene(m_bmain, scene, *ctime);
++		bc_update_scene(m_bmain, depsgraph, scene, *ctime);
  		BKE_object_matrix_local_get(ob, fmat);
  		if (this->export_settings->limit_precision)
  			bc_sanitize_mat(fmat, 6);
@@@ -246,7 -247,7 +247,7 @@@ void AnimationExporter::export_sampled_
  		float fsize[3];
  		float feul[3];
  
- 		bc_update_scene(depsgraph, scene, *ctime);
 -		bc_update_scene(m_bmain, scene, *ctime);
++		bc_update_scene(m_bmain, depsgraph, scene, *ctime);
  		BKE_object_matrix_local_get(ob, fmat);
  		mat4_decompose(floc, fquat, fsize, fmat);
  		quat_to_eul(feul, fquat);
@@@ -1315,16 -1316,15 +1316,16 @@@ std::string AnimationExporter::create_4
  		float frame = *it;
  
  		float ctime = BKE_scene_frame_get_from_ctime(scene, frame);
- 		bc_update_scene(depsgraph, scene, ctime);
 -		bc_update_scene(m_bmain, scene, ctime);
++		bc_update_scene(m_bmain, depsgraph, scene, ctime);
  		if (is_bone_animation) {
 +
  			if (pchan->flag & POSE_CHAIN) {
  				enable_fcurves(ob->adt->action, NULL);
 -				BKE_animsys_evaluate_animdata(scene, &ob->id, ob->adt, ctime, ADT_RECALC_ALL);
 -				BKE_pose_where_is(scene, ob);
 +				BKE_animsys_evaluate_animdata(depsgraph, scene, &ob->id, ob->adt, ctime, ADT_RECALC_ALL);
 +				BKE_pose_where_is(depsgraph, scene, ob);
  			}
  			else {
 -				BKE_pose_where_is_bone(scene, ob, pchan, ctime, 1);
 +				BKE_pose_where_is_bone(depsgraph, scene, ob, pchan, ctime, 1);
  			}
  
  			// compute bone local mat
diff --cc source/blender/collada/AnimationExporter.h
index a50bcaf0ef4,b6b67847f4e..67468458f81
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@@ -84,8 -84,8 +84,9 @@@ struct Depsgraph
  class AnimationExporter: COLLADASW::LibraryAnimations
  {
  private:
+ 	Main *m_bmain;
  	Scene *scene;
 +	Depsgraph *depsgraph;
  	COLLADASW::StreamWriter *sw;
  
  public:
diff --cc source/blender/collada/ArmatureImporter.cpp
index 0e71149fba6,28e962d62c0..2f5c3237bf6
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@@ -55,10 -54,10 +55,12 @@@ static const char *bc_get_joint_name(T 
  }
  
  
- ArmatureImporter::ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Scene *sce, ViewLayer *view_layer, const ImportSettings *import_settings) :
 -ArmatureImporter::ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Main *bmain, Scene *sce, const ImportSettings *import_settings) :
++ArmatureImporter::ArmatureImporter(
++        UnitConverter *conv, MeshImporterBase *mesh, Main *bmain, Scene *sce, ViewLayer *view_layer, const ImportSettings *import_settings) :
  	TransformReader(conv),
+ 	m_bmain(bmain),
  	scene(sce),
 +	view_layer(view_layer),
  	unit_converter(conv),
  	import_settings(import_settings),
  	empty(NULL),
@@@ -411,7 -410,7 +413,7 @@@ Object *ArmatureImporter::get_empty_for
  {
  	if (empty) return empty;
  
- 	empty = bc_add_object(scene, view_layer, OB_EMPTY, NULL);
 -	empty = bc_add_object(m_bmain, scene, OB_EMPTY, NULL);
++	empty = bc_add_object(m_bmain, scene, view_layer, OB_EMPTY, NULL);
  	empty->empty_drawtype = OB_EMPTY_SPHERE;
  
  	return empty;
@@@ -586,7 -585,7 +588,7 @@@ Object *ArmatureImporter::create_armatu
  		ob_arm = skin.set_armature(shared);
  	}
  	else {
- 		ob_arm = skin.create_armature(scene, view_layer);  //once for every armature
 -		ob_arm = skin.create_armature(m_bmain, scene);  //once for every armature
++		ob_arm = skin.create_armature(m_bmain, scene, view_layer);  //once for every armature
  	}
  
  	// enter armature edit mode
diff --cc source/blender/collada/ArmatureImporter.h
index 58121a090fa,a215b186f75..419861554f4
--- a/source/blender/collada/ArmatureImporter.h
+++ b/source/blender/collada/ArmatureImporter.h
@@@ -62,8 -62,8 +62,9 @@@ extern "C" 
  class ArmatureImporter : private TransformReader
  {
  private:
+ 	Main *m_bmain;
  	Scene *scene;
 +	ViewLayer *view_layer;
  	UnitConverter *unit_converter;
  	const ImportSettings *import_settings;
  
@@@ -138,7 -138,7 +139,8 @@@
  	TagsMap uid_tags_map;
  public:
  
- 	ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Scene *sce, ViewLayer *view_layer, const ImportSettings *import_settings);
 -	ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Main *bmain, Scene *sce, const ImportSettings *import_settings);
++	ArmatureImporter(
++	        UnitConverter *conv, MeshImporterBase *mesh, Main *bmain, Scene *sce, ViewLayer *view_layer, const ImportSettings *import_settings);
  	~ArmatureImporter();
  
  	void add_root_joint(COLLADAFW::Node *node, Object *parent);
diff --cc source/blender/collada/ControllerExporter.cpp
index 122094e33a6,5673d33fcbf..6cb1e58db6e
--- a/source/blender/collada/ControllerExporter.cpp
+++ b/source/blender/collada/ControllerExporter.cpp
@@@ -104,9 -107,9 +104,10 @@@ bool ControllerExporter::add_instance_c
  	return true;
  }
  
- void ControllerExporter::export_controllers(struct Depsgraph *depsgraph, Scene *sce)
 -void ControllerExporter::export_controllers(Main *bmain, Scene *sce)
++void ControllerExporter::export_controllers(Main *bmain, Depsgraph *depsgraph, Scene *sce)
  {
 +	this->depsgraph = depsgraph;
+ 	m_bmain = bmain;
  	scene = sce;
  
  	openLibrary();
@@@ -198,7 -201,9 +199,10 @@@ void ControllerExporter::export_skin_co
  	bool use_instantiation = this->export_settings->use_object_instantiation;
  	Mesh *me;
  
- 	me = bc_get_mesh_copy(depsgraph, scene,
+ 	me = bc_get_mesh_copy(
+ 				m_bmain,
++				depsgraph,
+ 				scene,
  				ob,
  				this->export_settings->export_mesh_type,
  				this->export_settings->apply_modifiers,
@@@ -300,7 -305,9 +304,10 @@@ void ControllerExporter::export_morph_c
  	bool use_instantiation = this->export_settings->use_object_instantiation;
  	Mesh *me;
  
- 	me = bc_get_mesh_copy(depsgraph, scene,
+ 	me = bc_get_mesh_copy(
+ 				m_bmain,
++				depsgraph,
+ 				scene,
  				ob,
  				this->export_settings->export_mesh_type,
  				this->export_settings->apply_modifiers,
diff --cc source/blender/collada/ControllerExporter.h
index e13d7c7ebea,2e258c63b6f..2b6853901be
--- a/source/blender/collada/ControllerExporter.h
+++ b/source/blender/collada/ControllerExporter.h
@@@ -66,12 -65,12 +66,13 @@@ public
  
  	bool add_instance_controller(Object *ob);
  
- 	void export_controllers(struct Depsgraph *depsgraph, Scene *sce);
 -	void export_controllers(Main *bmain, Scene *sce);
++	void export_controllers(Main *bmain, Depsgraph *depsgraph, Scene *sce);
  
  	void operator()(Object *ob);
  
  private:
- 	struct Depsgraph *depsgraph;
++	Depsgraph *depsgraph;
+ 	Main *m_bmain;
  	Scene *scene;
  	UnitConverter converter;
  	const ExportSettings *export_settings;
diff --cc source/blender/collada/DocumentExporter.cpp
index 9e78c164dad,669faa8358b..04d39f4f568
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@@ -180,8 -181,9 +180,9 @@@ static COLLADABU::NativeString make_tem
  // 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(bContext *C, const EvaluationContext *eval_ctx, Scene *sce)
 +int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce)
  {
+ 	Main *bmain = CTX_data_main(C);
  	PointerRNA sceneptr, unit_settings;
  	PropertyRNA *system; /* unused , *scale; */
  
@@@ -286,7 -288,7 +287,7 @@@
  	// <library_geometries>
  	if (bc_has_object_type(export_set, OB_MESH)) {
  		GeometryExporter ge(writer, this->export_settings);
- 		ge.exportGeom(depsgraph, sce);
 -		ge.exportGeom(bmain, sce);
++		ge.exportGeom(bmain, depsgraph, sce);
  	}
  
  	// <library_controllers>
@@@ -294,7 -296,7 +295,7 @@@
  	ControllerExporter controller_exporter(writer, this->export_settings);
  	if (bc_has_object_type(export_set, OB_ARMATURE) || this->export_settings->include_shapekeys)
  	{
- 		controller_exporter.export_controllers(depsgraph, sce);
 -		controller_exporter.export_controllers(bmain, sce);
++		controller_exporter.export_controllers(bmain, depsgraph, sce);
  	}
  
  	// <library_visual_scenes>
@@@ -303,10 -305,10 +304,10 @@@
  
  	if (this->export_settings->include_animations) {
  		// <library_animations>
 -		AnimationExporter ae(writer, this->export_settings);
 +		AnimationExporter ae(depsgraph, writer, this->export_settings);
- 		ae.exportAnimations(sce);
+ 		ae.exportAnimations(bmain, sce);
  	}
 -	se.exportScene(C, sce);
 +	se.exportScene(C, depsgraph, sce);
  
  	// <scene>
  	std::string scene_name(translate_id(id_name(sce)));
diff --cc source/blender/collada/DocumentImporter.cpp
index d80f7c20139,f84cd069778..7aeed15ee87
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@@ -107,9 -104,8 +107,9 @@@ DocumentImporter::DocumentImporter(bCon
  	import_settings(import_settings),
  	mImportStage(General),
  	mContext(C),
 -	armature_importer(&unit_converter, &mesh_importer, CTX_data_main(C), CTX_data_scene(C), import_settings),
 -	mesh_importer(&unit_converter, &armature_importer, CTX_data_main(C), CTX_data_scene(C)),
 +	view_layer(CTX_data_view_layer(mContext)),
- 	armature_importer(&unit_converter, &mesh_importer, CTX_data_scene(C), view_layer, import_settings),
- 	mesh_importer(&unit_converter, &armature_importer, CTX_data_scene(C), view_layer),
++	armature_importer(&unit_converter, &mesh_importer, CTX_data_main(C), CTX_data_scene(C), view_layer, import_settings),
++	mesh_importer(&unit_converter, &armature_importer, CTX_data_main(C), CTX_data_scene(C), view_layer),
  	anim_importer(&unit_converter, &armature_importer, CTX_data_scene(C))
  {
  }
@@@ -263,10 -259,18 +263,10 @@@ void DocumentImporter::finish(
  
  		fprintf(stderr, "got %d library nodes to free\n", 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list