Cleanup: make format
Dear developers remember to set your coding environment to use clang-format.
This commit is contained in:
@@ -783,7 +783,7 @@ void curve_deform_verts(Object *cuOb,
|
||||
|
||||
if (cu->flag & CU_DEFORM_BOUNDS_OFF) {
|
||||
for (a = 0, dvert_iter = dvert; a < numVerts; a++, dvert_iter++) {
|
||||
const float weight = invert_vgroup? 1.0f - defvert_find_weight(dvert_iter, defgrp_index) :
|
||||
const float weight = invert_vgroup ? 1.0f - defvert_find_weight(dvert_iter, defgrp_index) :
|
||||
defvert_find_weight(dvert_iter, defgrp_index);
|
||||
|
||||
if (weight > 0.0f) {
|
||||
@@ -800,7 +800,7 @@ void curve_deform_verts(Object *cuOb,
|
||||
INIT_MINMAX(cd.dmin, cd.dmax);
|
||||
|
||||
for (a = 0, dvert_iter = dvert; a < numVerts; a++, dvert_iter++) {
|
||||
const float weight = invert_vgroup? 1.0f - defvert_find_weight(dvert_iter, defgrp_index) :
|
||||
const float weight = invert_vgroup ? 1.0f - defvert_find_weight(dvert_iter, defgrp_index) :
|
||||
defvert_find_weight(dvert_iter, defgrp_index);
|
||||
if (weight > 0.0f) {
|
||||
mul_m4_v3(cd.curvespace, vert_coords[a]);
|
||||
@@ -809,7 +809,7 @@ void curve_deform_verts(Object *cuOb,
|
||||
}
|
||||
|
||||
for (a = 0, dvert_iter = dvert; a < numVerts; a++, dvert_iter++) {
|
||||
const float weight = invert_vgroup? 1.0f - defvert_find_weight(dvert_iter, defgrp_index) :
|
||||
const float weight = invert_vgroup ? 1.0f - defvert_find_weight(dvert_iter, defgrp_index) :
|
||||
defvert_find_weight(dvert_iter, defgrp_index);
|
||||
|
||||
if (weight > 0.0f) {
|
||||
@@ -899,8 +899,9 @@ static void lattice_deform_vert_task(void *__restrict userdata,
|
||||
const LatticeDeformUserdata *data = userdata;
|
||||
|
||||
if (data->dvert != NULL) {
|
||||
const float weight = data->invert_vgroup? 1.0f - defvert_find_weight(data->dvert + index, data->defgrp_index) :
|
||||
defvert_find_weight(data->dvert + index, data->defgrp_index);
|
||||
const float weight = data->invert_vgroup ?
|
||||
1.0f - defvert_find_weight(data->dvert + index, data->defgrp_index) :
|
||||
defvert_find_weight(data->dvert + index, data->defgrp_index);
|
||||
if (weight > 0.0f) {
|
||||
calc_latt_deform(data->lattice_deform_data, data->vert_coords[index], weight * data->fac);
|
||||
}
|
||||
|
||||
@@ -79,7 +79,8 @@ bool ErrorHandler::handleError(const COLLADASaxFWL::IError *error)
|
||||
error_context = "File access";
|
||||
}
|
||||
|
||||
else if (parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_REQUIRED_ATTRIBUTE_MISSING) {
|
||||
else if (parserError.getErrorType() ==
|
||||
GeneratedSaxParser::ParserError::ERROR_REQUIRED_ATTRIBUTE_MISSING) {
|
||||
isError = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -3935,7 +3935,10 @@ static Base *mesh_separate_tagged(
|
||||
/* DAG_relations_tag_update(bmain); */
|
||||
|
||||
/* new in 2.5 */
|
||||
BKE_object_material_array_assign(bmain, base_new->object, BKE_object_material_array(obedit), *BKE_object_material_num(obedit));
|
||||
BKE_object_material_array_assign(bmain,
|
||||
base_new->object,
|
||||
BKE_object_material_array(obedit),
|
||||
*BKE_object_material_num(obedit));
|
||||
|
||||
ED_object_base_select(base_new, BA_SELECT);
|
||||
|
||||
@@ -4002,7 +4005,10 @@ static Base *mesh_separate_arrays(Main *bmain,
|
||||
/* DAG_relations_tag_update(bmain); */
|
||||
|
||||
/* new in 2.5 */
|
||||
BKE_object_material_array_assign(bmain, base_new->object, BKE_object_material_array(obedit), *BKE_object_material_num(obedit));
|
||||
BKE_object_material_array_assign(bmain,
|
||||
base_new->object,
|
||||
BKE_object_material_array(obedit),
|
||||
*BKE_object_material_num(obedit));
|
||||
|
||||
ED_object_base_select(base_new, BA_SELECT);
|
||||
|
||||
|
||||
@@ -465,7 +465,8 @@ static Scene *preview_prepare_scene(
|
||||
copy_v4_v4(base->object->color, sp->color);
|
||||
|
||||
if (OB_TYPE_SUPPORT_MATERIAL(base->object->type)) {
|
||||
/* don't use BKE_object_material_assign, it changed mat->id.us, which shows in the UI */
|
||||
/* don't use BKE_object_material_assign, it changed mat->id.us, which shows in the UI
|
||||
*/
|
||||
Material ***matar = BKE_object_material_array(base->object);
|
||||
int actcol = max_ii(base->object->actcol - 1, 0);
|
||||
|
||||
|
||||
@@ -151,7 +151,11 @@ const EnumPropertyItem rna_enum_brush_gpencil_types_items[] = {
|
||||
|
||||
#ifndef RNA_RUNTIME
|
||||
static EnumPropertyItem rna_enum_gpencil_brush_eraser_modes_items[] = {
|
||||
{GP_BRUSH_ERASER_SOFT, "SOFT", 0, "Dissolve,", "Erase strokes, fading their points strength and thickness"},
|
||||
{GP_BRUSH_ERASER_SOFT,
|
||||
"SOFT",
|
||||
0,
|
||||
"Dissolve,",
|
||||
"Erase strokes, fading their points strength and thickness"},
|
||||
{GP_BRUSH_ERASER_HARD, "HARD", 0, "Point", "Erase stroke points"},
|
||||
{GP_BRUSH_ERASER_STROKE, "STROKE", 0, "Stroke", "Erase entire strokes"},
|
||||
{0, NULL, 0, NULL, NULL},
|
||||
|
||||
@@ -119,8 +119,14 @@ static void deformVerts(ModifierData *md,
|
||||
|
||||
/* silly that defaxis and curve_deform_verts are off by 1
|
||||
* but leave for now to save having to call do_versions */
|
||||
curve_deform_verts(
|
||||
cmd->object, ctx->object, vertexCos, numVerts, dvert, defgrp_index, cmd->flag, cmd->defaxis - 1);
|
||||
curve_deform_verts(cmd->object,
|
||||
ctx->object,
|
||||
vertexCos,
|
||||
numVerts,
|
||||
dvert,
|
||||
defgrp_index,
|
||||
cmd->flag,
|
||||
cmd->defaxis - 1);
|
||||
|
||||
if (!ELEM(mesh_src, NULL, mesh)) {
|
||||
BKE_id_free(NULL, mesh_src);
|
||||
|
||||
@@ -101,8 +101,14 @@ static void deformVerts(ModifierData *md,
|
||||
|
||||
MOD_previous_vcos_store(md, vertexCos); /* if next modifier needs original vertices */
|
||||
|
||||
lattice_deform_verts(
|
||||
lmd->object, ctx->object, mesh_src, vertexCos, numVerts, lmd->flag, lmd->name, lmd->strength);
|
||||
lattice_deform_verts(lmd->object,
|
||||
ctx->object,
|
||||
mesh_src,
|
||||
vertexCos,
|
||||
numVerts,
|
||||
lmd->flag,
|
||||
lmd->name,
|
||||
lmd->strength);
|
||||
|
||||
if (!ELEM(mesh_src, NULL, mesh)) {
|
||||
BKE_id_free(NULL, mesh_src);
|
||||
|
||||
@@ -140,8 +140,9 @@ static void smoothModifier_do(
|
||||
}
|
||||
float *vco_new = accumulated_vecs[i];
|
||||
|
||||
const float f_new = invert_vgroup ? (1.0f - defvert_find_weight(dv, defgrp_index)) * fac_new :
|
||||
defvert_find_weight(dv, defgrp_index) * fac_new;
|
||||
const float f_new = invert_vgroup ?
|
||||
(1.0f - defvert_find_weight(dv, defgrp_index)) * fac_new :
|
||||
defvert_find_weight(dv, defgrp_index) * fac_new;
|
||||
if (f_new <= 0.0f) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user