[Bf-blender-cvs] [b0ec1d27470] master: Cleanup: Order return argument last
Hans Goudey
noreply at git.blender.org
Tue Jun 8 00:04:39 CEST 2021
Commit: b0ec1d27470133a5d59ba27d99fdd84d0c9e0528
Author: Hans Goudey
Date: Mon Jun 7 17:04:31 2021 -0500
Branches: master
https://developer.blender.org/rBb0ec1d27470133a5d59ba27d99fdd84d0c9e0528
Cleanup: Order return argument last
===================================================================
M source/blender/blenkernel/intern/displist.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index e501e0a2f45..8ab406a789e 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -869,9 +869,9 @@ static void curve_calc_modifiers_post(Depsgraph *depsgraph,
const Scene *scene,
Object *ob,
ListBase *dispbase,
- Mesh **r_final,
const bool for_render,
- const bool force_mesh_conversion)
+ const bool force_mesh_conversion,
+ Mesh **r_final)
{
const Curve *cu = (const Curve *)ob->data;
@@ -1180,7 +1180,7 @@ static void displist_make_surf(Depsgraph *depsgraph,
if (!for_orco) {
BKE_nurbList_duplicate(&ob->runtime.curve_cache->deformed_nurbs, &nubase);
curve_calc_modifiers_post(
- depsgraph, scene, ob, dispbase, r_final, for_render, force_mesh_conversion);
+ depsgraph, scene, ob, dispbase, for_render, force_mesh_conversion, r_final);
}
BKE_nurbList_free(&nubase);
@@ -1642,7 +1642,7 @@ static void do_makeDispListCurveTypes(Depsgraph *depsgraph,
BKE_nurbList_duplicate(&ob->runtime.curve_cache->deformed_nurbs, &nubase);
curve_calc_modifiers_post(
- depsgraph, scene, ob, dispbase, r_final, for_render, force_mesh_conversion);
+ depsgraph, scene, ob, dispbase, for_render, force_mesh_conversion, r_final);
}
if (cu->flag & CU_DEFORM_FILL && !ob->runtime.data_eval) {
More information about the Bf-blender-cvs
mailing list