blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2020-05-08 19:02:03 +10:00
parent c532c6c109
commit 32f7495e5a
27 changed files with 137 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/BKE_gpencil_modifier.h
View File

@ -267,7 +267,7 @@ void BKE_gpencil_modifier_free(struct GpencilModifierData *md);
bool BKE_gpencil_modifier_unique_name(struct ListBase *modifiers, struct GpencilModifierData *gmd);
bool BKE_gpencil_modifier_depends_ontime(struct GpencilModifierData *md);
struct GpencilModifierData *BKE_gpencil_modifiers_findby_type(struct Object *ob,
GpencilModifierType type);
GpencilModifierType type);
struct GpencilModifierData *BKE_gpencil_modifiers_findny_name(struct Object *ob, const char *name);
void BKE_gpencil_modifier_copydata_generic(const struct GpencilModifierData *md_src,
struct GpencilModifierData *md_dst);
@ -277,11 +277,11 @@ void BKE_gpencil_modifier_copydata_ex(struct GpencilModifierData *md,
struct GpencilModifierData *target,
const int flag);
void BKE_gpencil_modifiers_foreach_ID_link(struct Object *ob,
GreasePencilIDWalkFunc walk,
void *userData);
GreasePencilIDWalkFunc walk,
void *userData);
void BKE_gpencil_modifiers_foreach_tex_link(struct Object *ob,
GreasePencilTexWalkFunc walk,
void *userData);
GreasePencilTexWalkFunc walk,
void *userData);
bool BKE_gpencil_has_geometry_modifiers(struct Object *ob);
bool BKE_gpencil_has_time_modifiers(struct Object *ob);

65
source/blender/blenkernel/BKE_modifier.h
View File

@ -365,10 +365,12 @@ void BKE_modifier_free(struct ModifierData *md);
bool BKE_modifier_unique_name(struct ListBase *modifiers, struct ModifierData *md);
void BKE_modifier_copydata_generic(const struct ModifierData *md,
struct ModifierData *target,
const int flag);
struct ModifierData *target,
const int flag);
void BKE_modifier_copydata(struct ModifierData *md, struct ModifierData *target);
void BKE_modifier_copydata_ex(struct ModifierData *md, struct ModifierData *target, const int flag);
void BKE_modifier_copydata_ex(struct ModifierData *md,
struct ModifierData *target,
const int flag);
bool BKE_modifier_depends_ontime(struct ModifierData *md);
bool BKE_modifier_supports_mapping(struct ModifierData *md);
bool BKE_modifier_supports_cage(struct Scene *scene, struct ModifierData *md);
@ -376,8 +378,11 @@ bool BKE_modifier_couldbe_cage(struct Scene *scene, struct ModifierData *md);
bool BKE_modifier_is_correctable_deformed(struct ModifierData *md);
bool BKE_modifier_is_same_topology(ModifierData *md);
bool BKE_modifier_is_non_geometrical(ModifierData *md);
bool BKE_modifier_is_enabled(const struct Scene *scene, struct ModifierData *md, int required_mode);
void BKE_modifier_set_error(struct ModifierData *md, const char *format, ...) ATTR_PRINTF_FORMAT(2, 3);
bool BKE_modifier_is_enabled(const struct Scene *scene,
struct ModifierData *md,
int required_mode);
void BKE_modifier_set_error(struct ModifierData *md, const char *format, ...)
ATTR_PRINTF_FORMAT(2, 3);
bool BKE_modifier_is_preview(struct ModifierData *md);
void BKE_modifiers_foreach_object_link(struct Object *ob, ObjectWalkFunc walk, void *userData);
@ -388,9 +393,9 @@ struct ModifierData *BKE_modifiers_findby_type(struct Object *ob, ModifierType t
struct ModifierData *BKE_modifiers_findny_name(struct Object *ob, const char *name);
void BKE_modifiers_clear_errors(struct Object *ob);
int BKE_modifiers_get_cage_index(struct Scene *scene,
struct Object *ob,
int *r_lastPossibleCageIndex,
bool is_virtual);
struct Object *ob,
int *r_lastPossibleCageIndex,
bool is_virtual);
bool BKE_modifiers_is_modifier_enabled(struct Object *ob, int modifierType);
bool BKE_modifiers_is_softbody_enabled(struct Object *ob);
@ -418,15 +423,15 @@ typedef struct CDMaskLink {
* final_datamask is required at the end of the stack.
*/
struct CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene,
struct Object *ob,
struct ModifierData *md,
struct CustomData_MeshMasks *final_datamask,
int required_mode,
ModifierData *previewmd,
const struct CustomData_MeshMasks *previewmask);
struct Object *ob,
struct ModifierData *md,
struct CustomData_MeshMasks *final_datamask,
int required_mode,
ModifierData *previewmd,
const struct CustomData_MeshMasks *previewmask);
struct ModifierData *BKE_modifier_get_last_preview(struct Scene *scene,
struct ModifierData *md,
int required_mode);
struct ModifierData *md,
int required_mode);
typedef struct VirtualModifierData {
ArmatureModifierData amd;
@ -436,7 +441,7 @@ typedef struct VirtualModifierData {
} VirtualModifierData;
struct ModifierData *BKE_modifiers_get_virtual_modifierlist(const struct Object *ob,
struct VirtualModifierData *data);
struct VirtualModifierData *data);
/* ensure modifier correctness when changing ob->data */
void BKE_modifiers_test_object(struct Object *ob);
@ -454,27 +459,27 @@ const char *BKE_modifier_path_relbase_from_global(struct Object *ob);
* If the modifier data is already original, return it as-is. */
struct ModifierData *BKE_modifier_get_original(struct ModifierData *md);
struct ModifierData *BKE_modifier_get_evaluated(struct Depsgraph *depsgraph,
struct Object *object,
struct ModifierData *md);
struct Object *object,
struct ModifierData *md);
/* wrappers for modifier callbacks that ensure valid normals */
struct Mesh *BKE_modifier_modify_mesh(ModifierData *md,
const struct ModifierEvalContext *ctx,
struct Mesh *me);
const struct ModifierEvalContext *ctx,
struct Mesh *me);
void BKE_modifier_deform_verts(ModifierData *md,
const struct ModifierEvalContext *ctx,
struct Mesh *me,
float (*vertexCos)[3],
int numVerts);
const struct ModifierEvalContext *ctx,
struct Mesh *me,
float (*vertexCos)[3],
int numVerts);
void BKE_modifier_deform_vertsEM(ModifierData *md,
const struct ModifierEvalContext *ctx,
struct BMEditMesh *em,
struct Mesh *me,
float (*vertexCos)[3],
int numVerts);
const struct ModifierEvalContext *ctx,
struct BMEditMesh *em,
struct Mesh *me,
float (*vertexCos)[3],
int numVerts);
struct Mesh *BKE_modifier_get_evaluated_mesh_from_evaluated_object(struct Object *ob_eval,
const bool get_cage_mesh);

3
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -698,7 +698,8 @@ static float (*get_orco_coords(Object *ob, BMEditMesh *em, int layer, int *free)
/* apply shape key for cloth, this should really be solved
* by a more flexible customdata system, but not simple */
if (!em) {
ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Cloth);
ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(
ob, eModifierType_Cloth);
KeyBlock *kb = BKE_keyblock_from_key(BKE_key_from_object(ob),
clmd->sim_parms->shapekey_rest);

6
source/blender/blenkernel/intern/cloth.c
View File

@ -943,7 +943,8 @@ static void cloth_from_mesh(ClothModifierData *clmd, Mesh *mesh)
"clothVertex");
if (clmd->clothObject->verts == NULL) {
cloth_free_modifier(clmd);
BKE_modifier_set_error(&(clmd->modifier), "Out of memory on allocating clmd->clothObject->verts");
BKE_modifier_set_error(&(clmd->modifier),
"Out of memory on allocating clmd->clothObject->verts");
printf("cloth_free_modifier clmd->clothObject->verts\n");
return;
}
@ -959,7 +960,8 @@ static void cloth_from_mesh(ClothModifierData *clmd, Mesh *mesh)
clmd->clothObject->tri = MEM_mallocN(sizeof(MVertTri) * looptri_num, "clothLoopTris");
if (clmd->clothObject->tri == NULL) {
cloth_free_modifier(clmd);
BKE_modifier_set_error(&(clmd->modifier), "Out of memory on allocating clmd->clothObject->looptri");
BKE_modifier_set_error(&(clmd->modifier),
"Out of memory on allocating clmd->clothObject->looptri");
printf("cloth_free_modifier clmd->clothObject->looptri\n");
return;
}

12
source/blender/blenkernel/intern/fluid.c
View File

@ -1142,7 +1142,7 @@ static void update_obstacleflags(FluidDomainSettings *mds,
for (coll_index = 0; coll_index < coll_ob_array_len; coll_index++) {
Object *coll_ob = coll_ob_array[coll_index];
FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(coll_ob,
eModifierType_Fluid);
eModifierType_Fluid);
/* Sanity check. */
if (!mmd2) {
@ -1215,7 +1215,7 @@ static void compute_obstaclesemission(Scene *scene,
for (int effec_index = 0; effec_index < numeffecobjs; effec_index++) {
Object *effecobj = effecobjs[effec_index];
FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(effecobj,
eModifierType_Fluid);
eModifierType_Fluid);
/* Sanity check. */
if (!mmd2) {
@ -1388,7 +1388,7 @@ static void update_obstacles(Depsgraph *depsgraph,
for (int effec_index = 0; effec_index < numeffecobjs; effec_index++) {
Object *effecobj = effecobjs[effec_index];
FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(effecobj,
eModifierType_Fluid);
eModifierType_Fluid);
/* Sanity check. */
if (!mmd2) {
@ -2628,7 +2628,7 @@ static void update_flowsflags(FluidDomainSettings *mds, Object **flowobjs, int n
for (flow_index = 0; flow_index < numflowobj; flow_index++) {
Object *flow_ob = flowobjs[flow_index];
FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(flow_ob,
eModifierType_Fluid);
eModifierType_Fluid);
/* Sanity check. */
if (!mmd2) {
@ -2759,7 +2759,7 @@ static void compute_flowsemission(Scene *scene,
for (int flow_index = 0; flow_index < numflowobjs; flow_index++) {
Object *flowobj = flowobjs[flow_index];
FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(flowobj,
eModifierType_Fluid);
eModifierType_Fluid);
/* Sanity check. */
if (!mmd2) {
@ -2979,7 +2979,7 @@ static void update_flowsfluids(struct Depsgraph *depsgraph,
for (int flow_index = 0; flow_index < numflowobjs; flow_index++) {
Object *flowobj = flowobjs[flow_index];
FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(flowobj,
eModifierType_Fluid);
eModifierType_Fluid);
/* Sanity check. */
if (!mmd2) {

4
source/blender/blenkernel/intern/gpencil_modifier.c
View File

@ -605,7 +605,9 @@ void BKE_gpencil_modifiers_foreach_ID_link(Object *ob, GreasePencilIDWalkFunc wa
}
}
void BKE_gpencil_modifiers_foreach_tex_link(Object *ob, GreasePencilTexWalkFunc walk, void *userData)
void BKE_gpencil_modifiers_foreach_tex_link(Object *ob,
GreasePencilTexWalkFunc walk,
void *userData)
{
GpencilModifierData *md = ob->greasepencil_modifiers.first;

62
source/blender/blenkernel/intern/modifier.c
View File

@ -303,8 +303,8 @@ void BKE_modifiers_foreach_tex_link(Object *ob, TexWalkFunc walk, void *userData
* to avoid copying every member.
*/
void BKE_modifier_copydata_generic(const ModifierData *md_src,
ModifierData *md_dst,
const int UNUSED(flag))
ModifierData *md_dst,
const int UNUSED(flag))
{
const ModifierTypeInfo *mti = BKE_modifier_get_info(md_src->type);
@ -374,7 +374,8 @@ bool BKE_modifier_couldbe_cage(struct Scene *scene, ModifierData *md)
const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
return ((md->mode & eModifierMode_Realtime) && (md->mode & eModifierMode_Editmode) &&
(!mti->isDisabled || !mti->isDisabled(scene, md, 0)) && BKE_modifier_supports_mapping(md));
(!mti->isDisabled || !mti->isDisabled(scene, md, 0)) &&
BKE_modifier_supports_mapping(md));
}
bool BKE_modifier_is_same_topology(ModifierData *md)
@ -417,13 +418,14 @@ void BKE_modifier_set_error(ModifierData *md, const char *_format, ...)
* also used for some mesh tools to give warnings
*/
int BKE_modifiers_get_cage_index(struct Scene *scene,
Object *ob,
int *r_lastPossibleCageIndex,
bool is_virtual)
Object *ob,
int *r_lastPossibleCageIndex,
bool is_virtual)
{
VirtualModifierData virtualModifierData;
ModifierData *md = (is_virtual) ? BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData) :
ob->modifiers.first;
ModifierData *md = (is_virtual) ?
BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData) :
ob->modifiers.first;
int i, cageIndex = -1;
if (r_lastPossibleCageIndex) {
@ -527,12 +529,12 @@ bool BKE_modifier_is_enabled(const struct Scene *scene, ModifierData *md, int re
}
CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene,
Object *ob,
ModifierData *md,
CustomData_MeshMasks *final_datamask,
int required_mode,
ModifierData *previewmd,
const CustomData_MeshMasks *previewmask)
Object *ob,
ModifierData *md,
CustomData_MeshMasks *final_datamask,
int required_mode,
ModifierData *previewmd,
const CustomData_MeshMasks *previewmask)
{
CDMaskLink *dataMasks = NULL;
CDMaskLink *curr, *prev;
@ -594,7 +596,9 @@ CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene,
return dataMasks;
}
ModifierData *BKE_modifier_get_last_preview(struct Scene *scene, ModifierData *md, int required_mode)
ModifierData *BKE_modifier_get_last_preview(struct Scene *scene,
ModifierData *md,
int required_mode)
{
ModifierData *tmp_md = NULL;
@ -614,7 +618,7 @@ ModifierData *BKE_modifier_get_last_preview(struct Scene *scene, ModifierData *m
/* This is to include things that are not modifiers in the evaluation of the modifier stack, for
* example parenting to an armature. */
ModifierData *BKE_modifiers_get_virtual_modifierlist(const Object *ob,
VirtualModifierData *virtualModifierData)
VirtualModifierData *virtualModifierData)
{
ModifierData *md;
@ -932,7 +936,9 @@ void BKE_modifier_path_init(char *path, int path_maxlen, const char *name)
/* wrapper around ModifierTypeInfo.modifyMesh that ensures valid normals */
struct Mesh *BKE_modifier_modify_mesh(ModifierData *md, const ModifierEvalContext *ctx, struct Mesh *me)
struct Mesh *BKE_modifier_modify_mesh(ModifierData *md,
const ModifierEvalContext *ctx,
struct Mesh *me)
{
const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
BLI_assert(CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
@ -944,10 +950,10 @@ struct Mesh *BKE_modifier_modify_mesh(ModifierData *md, const ModifierEvalContex
}
void BKE_modifier_deform_verts(ModifierData *md,
const ModifierEvalContext *ctx,
Mesh *me,
float (*vertexCos)[3],
int numVerts)
const ModifierEvalContext *ctx,
Mesh *me,
float (*vertexCos)[3],
int numVerts)
{
const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
BLI_assert(!me || CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
@ -959,11 +965,11 @@ void BKE_modifier_deform_verts(ModifierData *md,
}
void BKE_modifier_deform_vertsEM(ModifierData *md,
const ModifierEvalContext *ctx,
struct BMEditMesh *em,
Mesh *me,
float (*vertexCos)[3],
int numVerts)
const ModifierEvalContext *ctx,
struct BMEditMesh *em,
Mesh *me,
float (*vertexCos)[3],
int numVerts)
{
const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
BLI_assert(!me || CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
@ -1016,7 +1022,9 @@ ModifierData *BKE_modifier_get_original(ModifierData *md)
return md->orig_modifier_data;
}
struct ModifierData *BKE_modifier_get_evaluated(Depsgraph *depsgraph, Object *object, ModifierData *md)
struct ModifierData *BKE_modifier_get_evaluated(Depsgraph *depsgraph,
Object *object,
ModifierData *md)
{
Object *object_eval = DEG_get_evaluated_object(depsgraph, object);
if (object_eval == object) {

5
source/blender/blenkernel/intern/multires.c
View File

@ -319,7 +319,7 @@ float (*BKE_multires_create_deformed_base_mesh_vert_coords(struct Depsgraph *dep
VirtualModifierData virtual_modifier_data;
ModifierData *first_md = BKE_modifiers_get_virtual_modifierlist(&object_for_eval,
&virtual_modifier_data);
&virtual_modifier_data);
Mesh *base_mesh = object->data;
@ -341,7 +341,8 @@ float (*BKE_multires_create_deformed_base_mesh_vert_coords(struct Depsgraph *dep
break;
}
BKE_modifier_deform_verts(md, &mesh_eval_context, base_mesh, deformed_verts, num_deformed_verts);
BKE_modifier_deform_verts(
md, &mesh_eval_context, base_mesh, deformed_verts, num_deformed_verts);
}
if (r_num_deformed_verts != NULL) {

3
source/blender/blenkernel/intern/object.c
View File

@ -4045,7 +4045,8 @@ int BKE_object_is_deform_modified(Scene *scene, Object *ob)
}
if (can_deform) {
if (!(flag & eModifierMode_Render) && BKE_modifier_is_enabled(scene, md, eModifierMode_Render)) {
if (!(flag & eModifierMode_Render) &&
BKE_modifier_is_enabled(scene, md, eModifierMode_Render)) {
flag |= eModifierMode_Render;
}

3
source/blender/blenkernel/intern/particle_system.c
View File

@ -4183,7 +4183,8 @@ static void particles_fluid_step(ParticleSimulationData *sim,
#else
{
Object *ob = sim->ob;
FluidModifierData *mmd = (FluidModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Fluid);
FluidModifierData *mmd = (FluidModifierData *)BKE_modifiers_findby_type(ob,
eModifierType_Fluid);
if (mmd && mmd->domain && mmd->domain->fluid) {
FluidDomainSettings *mds = mmd->domain;

2
source/blender/blenlib/intern/noise.c
View File

@ -23,8 +23,8 @@
#include <math.h>
#include "BLI_noise.h"
#include "BLI_compiler_compat.h"
#include "BLI_noise.h"
/* local */
static float noise3_perlin(float vec[3]);

3
source/blender/blenloader/intern/readfile.c
View File

@ -5380,7 +5380,8 @@ static void lib_link_object(FileData *fd, Main *bmain, Object *ob)
}
{
FluidModifierData *mmd = (FluidModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Fluid);
FluidModifierData *mmd = (FluidModifierData *)BKE_modifiers_findby_type(ob,
eModifierType_Fluid);
if (mmd && (mmd->type == MOD_FLUID_TYPE_DOMAIN) && mmd->domain) {
/* Flag for refreshing the simulation after loading */

4
source/blender/blenloader/intern/versioning_250.c
View File

@ -918,8 +918,8 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
if (do_gravity) {
for (md = ob->modifiers.first; md; md = md->next) {
ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(ob,
eModifierType_Cloth);
ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(
ob, eModifierType_Cloth);
if (clmd) {
clmd->sim_parms->effector_weights->global_gravity = clmd->sim_parms->gravity[2] /
-9.81f;

6
source/blender/blenloader/intern/versioning_legacy.c
View File

@ -1351,7 +1351,8 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
};
if ((me->flag & ME_SUBSURF)) {
SubsurfModifierData *smd = (SubsurfModifierData *)BKE_modifier_new(eModifierType_Subsurf);
SubsurfModifierData *smd = (SubsurfModifierData *)BKE_modifier_new(
eModifierType_Subsurf);
smd->levels = MAX2(1, me->subdiv);
smd->renderLevels = MAX2(1, me->subdivr);
@ -1428,7 +1429,8 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
}
}
if ((ob->softflag & OB_SB_ENABLE) && !BKE_modifiers_findby_type(ob, eModifierType_Softbody)) {
if ((ob->softflag & OB_SB_ENABLE) &&
!BKE_modifiers_findby_type(ob, eModifierType_Softbody)) {
if (ob->softflag & OB_SB_POSTDEF) {
md = ob->modifiers.first;

3
source/blender/draw/engines/overlay/overlay_extra.c
View File

@ -1506,7 +1506,8 @@ void OVERLAY_extra_cache_populate(OVERLAY_Data *vedata, Object *ob)
const bool draw_xform = draw_ctx->object_mode == OB_MODE_OBJECT &&
(scene->toolsettings->transform_flag & SCE_XFORM_DATA_ORIGIN) &&
(ob->base_flag & BASE_SELECTED) && !is_select_mode;
const bool draw_volume = !from_dupli && (md = BKE_modifiers_findby_type(ob, eModifierType_Fluid)) &&
const bool draw_volume = !from_dupli &&
(md = BKE_modifiers_findby_type(ob, eModifierType_Fluid)) &&
(BKE_modifier_is_enabled(scene, md, eModifierMode_Realtime)) &&
(((FluidModifierData *)md)->domain != NULL);

3
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@ -1362,7 +1362,8 @@ void DRW_mesh_batch_cache_create_requested(
}
/* Meh loose Scene const correctness here. */
const bool use_subsurf_fdots = scene ? BKE_modifiers_uses_subsurf_facedots((Scene *)scene, ob) : false;
const bool use_subsurf_fdots = scene ? BKE_modifiers_uses_subsurf_facedots((Scene *)scene, ob) :
false;
if (do_uvcage) {
mesh_buffer_cache_create_requested(cache,

2
source/blender/editors/gpencil/gpencil_armature.c
View File

@ -591,7 +591,7 @@ static int gpencil_generate_weights_exec(bContext *C, wmOperator *op)
else {
/* get armature from modifier */
GpencilModifierData *md = BKE_gpencil_modifiers_findby_type(ob_eval,
eGpencilModifierType_Armature);
eGpencilModifierType_Armature);
if (md == NULL) {
BKE_report(op->reports, RPT_ERROR, "The grease pencil object need an Armature modifier");
return OPERATOR_CANCELLED;

3
source/blender/editors/mesh/editmesh_loopcut.c
View File

@ -372,7 +372,8 @@ static int loopcut_init(bContext *C, wmOperator *op, const wmEvent *event)
if (is_interactive) {
for (uint base_index = 0; base_index < bases_len; base_index++) {
Object *ob_iter = bases[base_index]->object;
if (BKE_modifiers_is_deformed_by_lattice(ob_iter) || BKE_modifiers_is_deformed_by_armature(ob_iter)) {
if (BKE_modifiers_is_deformed_by_lattice(ob_iter) ||
BKE_modifiers_is_deformed_by_armature(ob_iter)) {
BKE_report(
op->reports, RPT_WARNING, "Loop cut does not work well on deformed edit mesh display");
break;

3
source/blender/editors/object/object_edit.c
View File

@ -1429,7 +1429,8 @@ static const EnumPropertyItem *object_mode_set_itemsf(bContext *C,
if (ob) {
const bool use_mode_particle_edit = (BLI_listbase_is_empty(&ob->particlesystem) == false) ||
(ob->soft != NULL) ||
(BKE_modifiers_findby_type(ob, eModifierType_Cloth) != NULL);
(BKE_modifiers_findby_type(ob, eModifierType_Cloth) !=
NULL);
while (input->identifier) {
if ((input->value == OB_MODE_EDIT && OB_TYPE_SUPPORT_EDITMODE(ob->type)) ||
(input->value == OB_MODE_POSE && (ob->type == OB_ARMATURE)) ||

4
source/blender/editors/object/object_modifier.c
View File

@ -2700,8 +2700,8 @@ static int laplaciandeform_bind_exec(bContext *C, wmOperator *op)
lmd->flag |= MOD_LAPLACIANDEFORM_BIND;
}
LaplacianDeformModifierData *lmd_eval = (LaplacianDeformModifierData *)BKE_modifier_get_evaluated(
depsgraph, ob, &lmd->modifier);
LaplacianDeformModifierData *lmd_eval = (LaplacianDeformModifierData *)
BKE_modifier_get_evaluated(depsgraph, ob, &lmd->modifier);
lmd_eval->flag = lmd->flag;
/* Force modifier to run, it will call binding routine

7
source/blender/editors/physics/particle_edit.c
View File

@ -2831,8 +2831,8 @@ static void remove_tagged_keys(Depsgraph *depsgraph, Object *ob, ParticleSystem
if (pe_x_mirror(ob)) {
/* mirror key tags */
ParticleSystemModifierData *psmd = psys_get_modifier(ob, psys);
ParticleSystemModifierData *psmd_eval = (ParticleSystemModifierData *)BKE_modifier_get_evaluated(
depsgraph, ob, &psmd->modifier);
ParticleSystemModifierData *psmd_eval = (ParticleSystemModifierData *)
BKE_modifier_get_evaluated(depsgraph, ob, &psmd->modifier);
LOOP_POINTS {
LOOP_TAGGED_KEYS {
@ -5127,7 +5127,8 @@ void PE_create_particle_edit(
int totpoint;
if (psmd != NULL) {
psmd_eval = (ParticleSystemModifierData *)BKE_modifiers_findny_name(ob_eval, psmd->modifier.name);
psmd_eval = (ParticleSystemModifierData *)BKE_modifiers_findny_name(ob_eval,
psmd->modifier.name);
}
/* no psmd->dm happens in case particle system modifier is not enabled */

3
source/blender/makesrna/intern/rna_cloth.c
View File

@ -63,7 +63,8 @@ static void rna_cloth_pinning_changed(Main *UNUSED(bmain), Scene *UNUSED(scene),
{
Object *ob = (Object *)ptr->owner_id;
/* ClothSimSettings *settings = (ClothSimSettings *)ptr->data; */
ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Cloth);
ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(ob,
eModifierType_Cloth);
cloth_free_modifier(clmd);

4
source/blender/modifiers/intern/MOD_array.c
View File

@ -515,8 +515,8 @@ static Mesh *arrayModifier_doArray(ArrayModifierData *amd,
(size_t)end_cap_nverts) > max_num_vertices) {
count = 1;
BKE_modifier_set_error(&amd->modifier,
"The amount of copies is too high, we cannot generate the amount of "
"geometry it would require");
"The amount of copies is too high, we cannot generate the amount of "
"geometry it would require");
}
if (count < 1) {

3
source/blender/modifiers/intern/MOD_correctivesmooth.c
View File

@ -639,7 +639,8 @@ static void correctivesmooth_modifier_do(ModifierData *md,
uint me_numVerts = (uint)((em) ? em->bm->totvert : ((Mesh *)ob->data)->totvert);
if (me_numVerts != numVerts) {
BKE_modifier_set_error(md, "Original vertex count mismatch: %u to %u", me_numVerts, numVerts);
BKE_modifier_set_error(
md, "Original vertex count mismatch: %u to %u", me_numVerts, numVerts);
goto error;
}
}

4
source/blender/modifiers/intern/MOD_laplaciandeform.c
View File

@ -676,8 +676,8 @@ static void LaplacianDeformModifier_do(
}
else if (sysdif == LAPDEFORM_SYSTEM_CHANGE_NOT_VALID_GROUP) {
BKE_modifier_set_error(&lmd->modifier,
"Vertex group '%s' is not valid, or maybe empty",
sys->anchor_grp_name);
"Vertex group '%s' is not valid, or maybe empty",
sys->anchor_grp_name);
}
}
}

3
source/blender/modifiers/intern/MOD_meshsequencecache.c
View File

@ -109,7 +109,8 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
STRNCPY(mcmd->reader_object_path, mcmd->object_path);
BKE_cachefile_reader_open(cache_file, &mcmd->reader, ctx->object, mcmd->object_path);
if (!mcmd->reader) {
BKE_modifier_set_error(md, "Could not create Alembic reader for file %s", cache_file->filepath);
BKE_modifier_set_error(
md, "Could not create Alembic reader for file %s", cache_file->filepath);
return mesh;
}
}

9
source/blender/modifiers/intern/MOD_surfacedeform.c
View File

@ -1056,7 +1056,8 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd_orig,
mpoly, medge, mloop, tnumpoly, tnumedges, vert_edges, adj_array, edge_polys);
if (adj_result == MOD_SDEF_BIND_RESULT_NONMANY_ERR) {
BKE_modifier_set_error((ModifierData *)smd_eval, "Target has edges with more than two polygons");
BKE_modifier_set_error((ModifierData *)smd_eval,
"Target has edges with more than two polygons");
freeAdjacencyMap(vert_edges, adj_array, edge_polys);
free_bvhtree_from_mesh(&treeData);
MEM_freeN(smd_orig->verts);
@ -1106,7 +1107,8 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd_orig,
freeData((ModifierData *)smd_orig);
}
else if (data.success == MOD_SDEF_BIND_RESULT_NONMANY_ERR) {
BKE_modifier_set_error((ModifierData *)smd_eval, "Target has edges with more than two polygons");
BKE_modifier_set_error((ModifierData *)smd_eval,
"Target has edges with more than two polygons");
freeData((ModifierData *)smd_orig);
}
else if (data.success == MOD_SDEF_BIND_RESULT_CONCAVE_ERR) {
@ -1245,7 +1247,8 @@ static void surfacedeformModifier_do(ModifierData *md,
return;
}
SurfaceDeformModifierData *smd_orig = (SurfaceDeformModifierData *)BKE_modifier_get_original(md);
SurfaceDeformModifierData *smd_orig = (SurfaceDeformModifierData *)BKE_modifier_get_original(
md);
float tmp_mat[4][4];
invert_m4_m4(tmp_mat, ob->obmat);