[Bf-blender-cvs] [bb7202495a2] blender2.8: Merge branch 'master' into blender2.8
Bastien Montagne
noreply at git.blender.org
Wed Jun 6 16:25:56 CEST 2018
Commit: bb7202495a289370fe39a9aaeebf8d21fa7d357c
Author: Bastien Montagne
Date: Wed Jun 6 16:25:28 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbb7202495a289370fe39a9aaeebf8d21fa7d357c
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentExporter.h
source/blender/collada/SceneExporter.cpp
source/blender/collada/SceneExporter.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_screen.h
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
===================================================================
diff --cc source/blender/collada/ArmatureExporter.cpp
index 5e349535610,9afe4662f74..c50de1ef72e
--- a/source/blender/collada/ArmatureExporter.cpp
+++ b/source/blender/collada/ArmatureExporter.cpp
@@@ -62,10 -62,11 +62,11 @@@ ArmatureExporter::ArmatureExporter(COLL
}
// write bone nodes
- void ArmatureExporter::add_armature_bones(Depsgraph *depsgraph, Object *ob_arm,
-void ArmatureExporter::add_armature_bones(bContext *C, Object *ob_arm, Scene *sce,
- SceneExporter *se,
++void ArmatureExporter::add_armature_bones(bContext *C, Depsgraph *depsgraph, Object *ob_arm,
+ Scene *sce, SceneExporter *se,
std::list<Object *>& child_objects)
{
+ Main *bmain = CTX_data_main(C);
// write bone nodes
bArmature * armature = (bArmature *)ob_arm->data;
@@@ -77,7 -78,7 +78,7 @@@
for (Bone *bone = (Bone *)armature->bonebase.first; bone; bone = bone->next) {
// start from root bones
if (!bone->parent)
- add_bone_node(depsgraph, bone, ob_arm, sce, se, child_objects);
- add_bone_node(C, bone, ob_arm, sce, se, child_objects);
++ add_bone_node(C, depsgraph, bone, ob_arm, sce, se, child_objects);
}
if (!is_edited) {
@@@ -157,7 -161,7 +158,7 @@@ void ArmatureExporter::find_objects_usi
#endif
// parent_mat is armature-space
- void ArmatureExporter::add_bone_node(Depsgraph *depsgraph, Bone *bone, Object *ob_arm, Scene *sce,
-void ArmatureExporter::add_bone_node(bContext *C, Bone *bone, Object *ob_arm, Scene *sce,
++void ArmatureExporter::add_bone_node(bContext *C, Depsgraph *depsgraph, Bone *bone, Object *ob_arm, Scene *sce,
SceneExporter *se,
std::list<Object *>& child_objects)
{
@@@ -231,7 -235,7 +232,7 @@@
mul_m4_m4m4((*i)->parentinv, temp, (*i)->parentinv);
}
- se->writeNodes(depsgraph, *i, sce);
- se->writeNodes(C, *i, sce);
++ se->writeNodes(C, depsgraph, *i, sce);
copy_m4_m4((*i)->parentinv, backup_parinv);
child_objects.erase(i++);
@@@ -240,13 -244,13 +241,13 @@@
}
for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) {
- add_bone_node(depsgraph, child, ob_arm, sce, se, child_objects);
- add_bone_node(C, child, ob_arm, sce, se, child_objects);
++ add_bone_node(C, depsgraph, child, ob_arm, sce, se, child_objects);
}
node.end();
}
else {
for (Bone *child = (Bone *)bone->childbase.first; child; child = child->next) {
- add_bone_node(depsgraph, child, ob_arm, sce, se, child_objects);
- add_bone_node(C, child, ob_arm, sce, se, child_objects);
++ add_bone_node(C, depsgraph, child, ob_arm, sce, se, child_objects);
}
}
}
diff --cc source/blender/collada/ArmatureExporter.h
index 17c02d637e8,3199703cb20..7efa8b70e43
--- a/source/blender/collada/ArmatureExporter.h
+++ b/source/blender/collada/ArmatureExporter.h
@@@ -60,7 -60,7 +60,7 @@@ public
ArmatureExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings);
// write bone nodes
- void add_armature_bones(struct Depsgraph *depsgraph, Object *ob_arm, Scene *sce, SceneExporter *se,
- void add_armature_bones(bContext *C, Object *ob_arm, Scene *sce, SceneExporter *se,
++ void add_armature_bones(bContext *C, struct Depsgraph *depsgraph, Object *ob_arm, Scene *sce, SceneExporter *se,
std::list<Object *>& child_objects);
bool add_instance_controller(Object *ob);
@@@ -85,7 -85,7 +85,7 @@@ private
// Scene, SceneExporter and the list of child_objects
// are required for writing bone parented objects
- void add_bone_node(struct Depsgraph *depsgraph, Bone *bone, Object *ob_arm, Scene *sce, SceneExporter *se,
- void add_bone_node(bContext *C, Bone *bone, Object *ob_arm, Scene *sce, SceneExporter *se,
++ void add_bone_node(bContext *C, struct Depsgraph *depsgraph, Bone *bone, Object *ob_arm, Scene *sce, SceneExporter *se,
std::list<Object *>& child_objects);
void add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW::Node& node);
diff --cc source/blender/collada/ArmatureImporter.cpp
index f24688479af,964f1f6b9e4..6bf6087c054
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@@ -627,10 -625,10 +627,10 @@@ Object *ArmatureImporter::create_armatu
connect_bone_chains(armature, (Bone *)armature->bonebase.first, UNLIMITED_CHAIN_MAX);
}
fix_leaf_bone_hierarchy(armature, (Bone *)armature->bonebase.first, this->import_settings->fix_orientation);
- ED_armature_from_edit(armature);
+ ED_armature_from_edit(bmain, armature);
ED_armature_edit_free(armature);
- DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
+ DEG_id_tag_update(&ob_arm->id, OB_RECALC_OB | OB_RECALC_DATA);
return ob_arm;
}
diff --cc source/blender/collada/DocumentExporter.cpp
index a66c4db7b4d,472bd326205..c685df84d02
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@@ -180,8 -181,7 +180,8 @@@ 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(Scene *sce)
++int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce)
{
PointerRNA sceneptr, unit_settings;
PropertyRNA *system; /* unused , *scale; */
@@@ -304,10 -304,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);
}
- se.exportScene(depsgraph, 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/DocumentExporter.h
index c98f82e68b4,817df3735da..8a48ca29090
--- a/source/blender/collada/DocumentExporter.h
+++ b/source/blender/collada/DocumentExporter.h
@@@ -39,12 -39,10 +39,12 @@@ struct Scene
class DocumentExporter
{
public:
- DocumentExporter(const ExportSettings *export_settings);
- int exportCurrentScene(bContext *C, const EvaluationContext *eval_ctx, Scene *sce);
+ DocumentExporter(Depsgraph *depsgraph, const ExportSettings *export_settings);
- int exportCurrentScene(Scene *sce);
++ int exportCurrentScene(bContext *C, Scene *sce);
+
void exportScenes(const char *filename);
private:
+ Depsgraph *depsgraph;
const ExportSettings *export_settings;
};
diff --cc source/blender/collada/SceneExporter.cpp
index 5d1df800746,c195ecb4725..62ab4af5d1a
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/collada/SceneExporter.cpp
@@@ -39,17 -38,17 +39,17 @@@ SceneExporter::SceneExporter(COLLADASW:
{
}
- void SceneExporter::exportScene(Depsgraph *depsgraph, Scene *sce)
-void SceneExporter::exportScene(bContext *C, Scene *sce)
++void SceneExporter::exportScene(bContext *C, Depsgraph *depsgraph, Scene *sce)
{
// <library_visual_scenes> <visual_scene>
std::string id_naming = id_name(sce);
openVisualScene(translate_id(id_naming), id_naming);
- exportHierarchy(depsgraph, sce);
- exportHierarchy(C, sce);
++ exportHierarchy(C, depsgraph, sce);
closeVisualScene();
closeLibrary();
}
- void SceneExporter::exportHierarchy(Depsgraph *depsgraph, Scene *sce)
-void SceneExporter::exportHierarchy(bContext *C, Scene *sce)
++void SceneExporter::exportHierarchy(bContext *C, Depsgraph *depsgraph, Scene *sce)
{
LinkNode *node;
std::vector<Object *> base_objects;
@@@ -81,13 -80,13 +81,13 @@@
Object *ob = base_objects[index];
if (bc_is_marked(ob)) {
bc_remove_mark(ob);
- writeNodes(depsgraph, ob, sce);
- writeNodes(C, ob, sce);
++ writeNodes(C, depsgraph, ob, sce);
}
}
}
- void SceneExporter::writeNodes(Depsgraph *depsgraph, Object *ob, Scene *sce)
-void SceneExporter::writeNodes(bContext *C, Object *ob, Scene *sce)
++void SceneExporter::writeNodes(bContext *C, Depsgraph *depsgraph, Object *ob, Scene *sce)
{
// Add associated armature first if available
bool armature_exported = false;
@@@ -96,7 -95,7 +96,7 @@@
armature_exported = bc_is_in_Export_set(this->export_settings->export_set, ob_arm);
if (armature_exported && bc_is_marked(ob_arm)) {
bc_remove_mark(ob_arm);
- writeNodes(depsgraph, ob_arm, sce);
- writeNodes(C, ob_arm, sce);
++ writeNodes(C, depsgraph, ob_arm, sce);
armature_exported = true;
}
}
@@@ -155,7 -157,7 +155,7 @@@
// <instance_controller>
else if (ob->type == OB_ARMATURE) {
- arm_exporter->add_armature_bones(depsgraph, ob, sce, this, child_objects);
- arm_exporter->add_armature_bones(C, ob, sce, this, child_objects);
++ arm_exporter->add_armature_bones(C, depsgraph, ob, sce, this, child_objects);
}
// <instance_camera>
@@@ -234,7 -235,7 +234,7 @@@
for (std::list<Object *>::iterator i = child_objects.begin(); i != child_objects.end(); ++i) {
if (bc_is_marked(*i)) {
bc_remove_mark(*i);
- writeNodes(depsgraph, *i, sce);
- writeNodes(C, *i, sce);
++ writeNodes(C, depsgraph, *i, sce);
}
}
diff --cc source/blender/collada/SceneExporter.h
index c330aa81e91,60cb078d91b..24a2dcf08c8
--- a/source/blender/collada/SceneExporter.h
+++ b/source/blender/collada/SceneExporter.h
@@@ -96,12 -96,12 +96,12 @@@ class SceneExporter: COLLADASW::Library
{
public:
SceneExporter(COLLADASW::StreamWriter *sw, ArmatureExporter *arm, const ExportSettings *export_settings);
- void exportScene(Depsgraph *depsgraph, Scene *sce);
- void exportScene(bContext *C, Scene *sce);
++ void exportScene(bContext *C, Depsgraph *depsgraph, Scene *sce);
private:
friend class ArmatureExporter;
- void exportHierarchy(struct Depsgraph *depsgraph, Scene *sce);
- void writeNodes(struct Depsgraph *depsgraph, Object *ob
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list