diff options
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 807b240870e..b3c4f988f19 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2321,7 +2321,7 @@ static void ensure_curve_cache(Main *bmain, Scene *scene, Object *object) BKE_displist_make_curveTypes(scene, object, false); break; case OB_MBALL: - BKE_displist_make_mball(bmain->eval_ctx, scene, object); + BKE_displist_make_mball(bmain, bmain->eval_ctx, scene, object); break; case OB_LATTICE: BKE_lattice_modifiers_calc(scene, object); @@ -8186,7 +8186,7 @@ void draw_object_select(Main *bmain, Scene *scene, ARegion *ar, View3D *v3d, Bas Base tbase; tbase.flag = OB_FROMDUPLI; - lb = object_duplilist(bmain->eval_ctx, scene, base->object); + lb = object_duplilist(bmain, bmain->eval_ctx, scene, base->object); for (dob = lb->first; dob; dob = dob->next) { float omat[4][4]; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 3c89c9c6ca6..b82a841f40e 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2115,7 +2115,7 @@ static void draw_dupli_objects_color( } tbase.flag = OB_FROMDUPLI | base->flag; - lb = object_duplilist(bmain->eval_ctx, scene, base->object); + lb = object_duplilist(bmain, bmain->eval_ctx, scene, base->object); // BLI_listbase_sort(lb, dupli_ob_sort); /* might be nice to have if we have a dupli list with mixed objects. */ apply_data = duplilist_apply(base->object, scene, lb); @@ -2632,7 +2632,7 @@ static void gpu_update_lamps_shadows_world(Main *bmain, Scene *scene, View3D *v3 if (ob->transflag & OB_DUPLI) { DupliObject *dob; - ListBase *lb = object_duplilist(bmain->eval_ctx, scene, ob); + ListBase *lb = object_duplilist(bmain, bmain->eval_ctx, scene, ob); for (dob = lb->first; dob; dob = dob->next) if (dob->ob->type == OB_LAMP) |