diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 13:14:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 13:15:14 +0300 |
| commit | d0956e9cb3077971a9ae6c1ba9560604d5ad1ef7 (patch) | |
| tree | 0dea964abf85748db7ab15a2feee1a41bf6ec52c /source/blender/editors/space_view3d/view3d_draw.c | |
| parent | 8055ed2741d1da48f2bf84c75ccb37b54cef1ab8 (diff) | |
Cleanup: Moar G.main removal of Hell.
This commit actually adds some G.main... but at much, much higher level
than the ones it removes, so should still be better ;)
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |