Commit: 2acad794262ca912023d7fd04f16c4f72124137c Author: Baardaap Date: Thu Dec 15 15:09:12 2022 +0100 Branches: refactor-mesh-uv-map-generic https://developer.blender.org/rB2acad794262ca912023d7fd04f16c4f72124137c
Cleanup: make format =================================================================== M source/blender/draw/intern/draw_manager_data.cc M source/blender/modifiers/intern/MOD_array.cc M source/blender/modifiers/intern/MOD_screw.cc =================================================================== diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc index fbeba1f943a..fc2fbd54300 100644 --- a/source/blender/draw/intern/draw_manager_data.cc +++ b/source/blender/draw/intern/draw_manager_data.cc @@ -695,7 +695,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob) drw_call_calc_orco(ob, ob_infos->orcotexfac); /* Random float value. */ uint random = (DST.dupli_source) ? - DST.dupli_source->random_id : + DST.dupli_source->random_id : /* TODO(fclem): this is rather costly to do at runtime. Maybe we can * put it in ob->runtime and make depsgraph ensure it is up to date. */ BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0); diff --git a/source/blender/modifiers/intern/MOD_array.cc b/source/blender/modifiers/intern/MOD_array.cc index 7c277ffbeff..411c839c42a 100644 --- a/source/blender/modifiers/intern/MOD_array.cc +++ b/source/blender/modifiers/intern/MOD_array.cc @@ -673,7 +673,8 @@ static Mesh *arrayModifier_doArray(ArrayModifierData *amd, if (chunk_nloops > 0 && is_zero_v2(amd->uv_offset) == false) { const int totuv = CustomData_number_of_layers(&result->ldata, CD_PROP_FLOAT2); for (i = 0; i < totuv; i++) { - float(*dmloopuv)[2] = static_cast<float (*)[2]>(CustomData_get_layer_n(&result->ldata, CD_PROP_FLOAT2, i)); + float(*dmloopuv)[2] = static_cast<float(*)[2]>( + CustomData_get_layer_n(&result->ldata, CD_PROP_FLOAT2, i)); dmloopuv += chunk_nloops; for (c = 1; c < count; c++) { const float uv_offset[2] = { diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc index 84fb4ac36cc..45294acf330 100644 --- a/source/blender/modifiers/intern/MOD_screw.cc +++ b/source/blender/modifiers/intern/MOD_screw.cc @@ -408,7 +408,8 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * if (mloopuv_layers_tot) { uint uv_lay; for (uv_lay = 0; uv_lay < mloopuv_layers_tot; uv_lay++) { - mloopuv_layers[uv_lay] = static_cast<blender::float2 *>(CustomData_get_layer_n(&result->ldata, CD_PROP_FLOAT2, int(uv_lay))); + mloopuv_layers[uv_lay] = static_cast<blender::float2 *>( + CustomData_get_layer_n(&result->ldata, CD_PROP_FLOAT2, int(uv_lay))); } if (ltmd->flag & MOD_SCREW_UV_STRETCH_V) { _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs