archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix compilation error with Collada enabled

Browse Source
This commit is contained in:
Sergey Sharybin
2017-07-21 17:44:11 +02:00
parent 911f239d09
commit ac0da72a60
13 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/collada/collada_utils.cpp
View File

@@ -116,7 +116,7 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space)
}
// apply child obmat (i.e. decompose it into rot/loc/size)
BKE_object_apply_mat4(&eval_ctx, ob, ob->obmat, 0, 0);
BKE_object_apply_mat4(ob, ob->obmat, 0, 0);
// compute parentinv
BKE_object_workob_calc_parent(&eval_ctx, sce, ob, &workob);
@@ -147,7 +147,7 @@ Object *bc_add_object(Scene *scene, int type, const char *name)
return ob;
}
Mesh *bc_get_mesh_copy(Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate)
Mesh *bc_get_mesh_copy(struct EvaluationContext *eval_ctx, Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate)
{
Mesh *tmpmesh;
CustomDataMask mask = CD_MASK_MESH;
@@ -157,12 +157,12 @@ Mesh *bc_get_mesh_copy(Scene *scene, Object *ob, BC_export_mesh_type export_mesh
switch (export_mesh_type) {
case BC_MESH_TYPE_VIEW:
{
dm = mesh_create_derived_view(scene, ob, mask);
dm = mesh_create_derived_view(eval_ctx, scene, ob, mask);
break;
}
case BC_MESH_TYPE_RENDER:
{
dm = mesh_create_derived_render(scene, ob, mask);
dm = mesh_create_derived_render(eval_ctx, scene, ob, mask);
break;
}
}