Commit: 73bb3d4d77ff4f72d08b423d93e997e10475371f Author: Dalai Felinto Date: Mon Feb 6 16:08:41 2017 +0100 Branches: render-layers https://developer.blender.org/rB73bb3d4d77ff4f72d08b423d93e997e10475371f
Missing Base to be ObjectBase convertion for mesh join operator =================================================================== M source/blender/editors/mesh/meshtools.c =================================================================== diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index b19bbf82ae..d34941efb7 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -77,7 +77,7 @@ static void join_mesh_single( Main *bmain, Scene *scene, - Object *ob_dst, Base *base_src, float imat[4][4], + Object *ob_dst, ObjectBase *base_src, float imat[4][4], MVert **mvert_pp, MEdge **medge_pp, MLoop **mloop_pp, MPoly **mpoly_pp, CustomData *vdata, CustomData *edata, CustomData *ldata, CustomData *pdata, int totvert, int totedge, int totloop, int totpoly, @@ -266,7 +266,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - Base *ob_base = CTX_data_active_base(C); + ObjectBase *ob_base = CTX_data_active_base(C); Object *ob = ob_base->object; Material **matar = NULL, *ma; Mesh *me; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs