Commit: 43eebdfebd6e31d188ae3c1b220c8991fc869df3
Author: Bastien Montagne
Date: Tue Jun 12 12:58:31 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB43eebdfebd6e31d188ae3c1b220c8991fc869df3
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_modifier.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_object.h
index 482d39b5e68,51cfc5b0087..ab8327d354a
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@@ -272,14 -243,9 +272,14 @@@ void BKE_object_sculpt_modifiers_change
int BKE_object_obdata_texspace_get(struct Object *ob, short **r_texflag,
float **r_loc, float **r_size, float **r_rot);
+struct Mesh *BKE_object_get_evaluated_mesh(const struct Depsgraph *depsgraph,
struct Object *ob);
+struct Mesh *BKE_object_get_final_mesh(struct Object *object);
+struct Mesh *BKE_object_get_pre_modified_mesh(struct Object *object);
+struct Mesh *BKE_object_get_original_mesh(struct Object *object);
+
int BKE_object_insert_ptcache(struct Object *ob);
void BKE_object_delete_ptcache(struct Object *ob, int index);
- struct KeyBlock *BKE_object_shapekey_insert(struct Object *ob, const char
*name, const bool from_mix);
+ struct KeyBlock *BKE_object_shapekey_insert(struct Main *bmain, struct Object
*ob, const char *name, const bool from_mix);
bool BKE_object_shapekey_remove(struct Main *bmain, struct Object *ob, struct
KeyBlock *kb);
bool BKE_object_shapekey_free(struct Main *bmain, struct Object *ob);
diff --cc source/blender/collada/DocumentImporter.cpp
index aab5a4ecfa9,5cbffbe4526..d80f7c20139
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@@ -244,8 -240,8 +244,8 @@@ void DocumentImporter::finish(
armature_importer.set_tags_map(this->uid_tags_map);
armature_importer.make_armatures(mContext, *objects_to_scale);
- armature_importer.make_shape_keys();
+ armature_importer.make_shape_keys(mContext);
- DAG_relations_tag_update(bmain);
+ DEG_relations_tag_update(bmain);
#if 0
armature_importer.fix_animation();
diff --cc source/blender/editors/include/ED_object.h
index f1311233f23,a8536e6f71c..a5155b5b945
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@@ -243,10 -215,9 +243,10 @@@ int ED_object_modifier_move_down(struc
int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob,
struct ModifierData *md);
int ED_object_modifier_convert(
struct ReportList *reports, struct Main *bmain, struct Scene *scene,
- struct Object *ob, struct ModifierData *md);
-int ED_object_modifier_apply(struct Main *bmain, struct ReportList *reports,
struct Scene *scene,
- struct Object *ob, struct ModifierData *md, int
mode);
+ struct ViewLayer *view_layer, struct Object *ob, struct ModifierData
*md);
+int ED_object_modifier_apply(
- struct ReportList *reports, struct Depsgraph *depsgraph, struct Scene
*scene,
++ struct Main *bmain, struct ReportList *reports, struct Depsgraph
*depsgraph, struct Scene *scene,
+ struct Object *ob, struct ModifierData *md, int mode);
int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob,
struct ModifierData *md);
bool ED_object_iter_other(
diff --cc source/blender/editors/mesh/meshtools.c
index 41e1ca13b79,8980e1830cf..146bcc742e5
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@@ -605,9 -598,9 +605,10 @@@ int join_mesh_exec(bContext *C, wmOpera
int join_mesh_shapes_exec(bContext *C, wmOperator *op)
{
+ Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Object *ob = CTX_data_active_object(C);
+ Depsgraph *depsgraph = CTX_data_depsgraph(C);
Mesh *me = (Mesh *)ob->data;
Mesh *selme = NULL;
DerivedMesh *dm = NULL;
diff --cc source/blender/editors/object/object_modifier.c
index 1b9af3725ca,824a26fe60e..8395eea336c
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@@ -524,7 -520,7 +524,8 @@@ int ED_object_modifier_convert(ReportLi
return 1;
}
- static int modifier_apply_shape(ReportList *reports, Depsgraph *depsgraph,
Scene *scene, Object *ob, ModifierData *md)
-static int modifier_apply_shape(Main *bmain, ReportList *reports, Scene
*scene, Object *ob, ModifierData *md)
++static int modifier_apply_shape(
++ Main *bmain, ReportList *reports, Depsgraph *depsgraph, Scene *scene,
Object *ob, ModifierData *md)
{
const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
@@@ -672,9 -667,7 +673,9 @@@ static int modifier_apply_obdata(Report
return 1;
}
-int ED_object_modifier_apply(Main *bmain, ReportList *reports, Scene *scene,
Object *ob, ModifierData *md, int mode)
+int ED_object_modifier_apply(
- ReportList *reports, Depsgraph *depsgraph,
++ Main *bmain, ReportList *reports, Depsgraph *depsgraph,
+ Scene *scene, Object *ob, ModifierData *md, int mode)
{
int prev_mode;
@@@ -702,7 -695,7 +703,7 @@@
md->mode |= eModifierMode_Realtime;
if (mode == MODIFIER_APPLY_SHAPE) {
- if (!modifier_apply_shape(reports, depsgraph, scene, ob, md)) {
- if (!modifier_apply_shape(bmain, reports, scene, ob, md)) {
++ if (!modifier_apply_shape(bmain, reports, depsgraph, scene, ob,
md)) {
md->mode = prev_mode;
return 0;
}
@@@ -1017,13 -998,13 +1018,14 @@@ void OBJECT_OT_modifier_move_down(wmOpe
static int modifier_apply_exec(bContext *C, wmOperator *op)
{
+ Main *bmain = CTX_data_main(C);
+ Depsgraph *depsgraph = CTX_data_depsgraph(C);
Scene *scene = CTX_data_scene(C);
Object *ob = ED_object_active_context(C);
ModifierData *md = edit_modifier_property_get(op, ob, 0);
int apply_as = RNA_enum_get(op->ptr, "apply_as");
- if (!md || !ED_object_modifier_apply(op->reports, depsgraph, scene, ob,
md, apply_as)) {
- if (!md || !ED_object_modifier_apply(bmain, op->reports, scene, ob, md,
apply_as)) {
++ if (!md || !ED_object_modifier_apply(bmain, op->reports, depsgraph,
scene, ob, md, apply_as)) {
return OPERATOR_CANCELLED;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
