diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-06-14 02:22:31 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-06-14 02:22:31 +0300 |
| commit | 84adc23941fada85fa4c1557628a95d21273a190 (patch) | |
| tree | 3ff196547c32a2e1d315835a83add28048e5d771 | |
| parent | 0f68e5c30a7fe91e9393415a058933d7c5dcf32d (diff) | |
Cleanup: Order return argument last
| -rw-r--r-- | source/blender/blenkernel/BKE_displist.h | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/displist.cc | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h index ffa0b4d0091..a2d9bbcd011 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -93,8 +93,8 @@ void BKE_displist_make_curveTypes_forRender(struct Depsgraph *depsgraph, const struct Scene *scene, struct Object *ob, struct ListBase *dispbase, - struct Mesh **r_final, - const bool for_orco); + const bool for_orco, + struct Mesh **r_final); void BKE_displist_make_mball(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob); void BKE_displist_make_mball_forRender(struct Depsgraph *depsgraph, struct Scene *scene, diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc index 8661941bd4c..a22a30aa2ee 100644 --- a/source/blender/blenkernel/intern/displist.cc +++ b/source/blender/blenkernel/intern/displist.cc @@ -1689,8 +1689,8 @@ void BKE_displist_make_curveTypes_forRender(Depsgraph *depsgraph, const Scene *scene, Object *ob, ListBase *dispbase, - Mesh **r_final, - const bool for_orco) + const bool for_orco, + Mesh **r_final) { if (ob->runtime.curve_cache == nullptr) { ob->runtime.curve_cache = (CurveCache *)MEM_callocN(sizeof(CurveCache), diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index e893a3983bd..c698d95ed8d 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -1113,7 +1113,7 @@ static void curve_to_mesh_eval_ensure(Object *object) * Brecht says hold off with that. */ Mesh *mesh_eval = NULL; BKE_displist_make_curveTypes_forRender( - NULL, NULL, &remapped_object, &remapped_object.runtime.curve_cache->disp, &mesh_eval, false); + NULL, NULL, &remapped_object, &remapped_object.runtime.curve_cache->disp, false, &mesh_eval); /* Note: this is to be consistent with `BKE_displist_make_curveTypes()`, however that is not a * real issue currently, code here is broken in more than one way, fix(es) will be done |