[Bf-blender-cvs] [645298be296] master: Fix build error after last commit
Hans Goudey
noreply at git.blender.org
Sat Jan 9 06:11:04 CET 2021
Commit: 645298be29601b0e772a15fe04c570a31df4a25d
Author: Hans Goudey
Date: Fri Jan 8 23:10:58 2021 -0600
Branches: master
https://developer.blender.org/rB645298be29601b0e772a15fe04c570a31df4a25d
Fix build error after last commit
===================================================================
M source/blender/editors/object/object_modifier.c
===================================================================
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 5b07c11b254..3b0972a93ee 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -746,7 +746,6 @@ static bool modifier_apply_obdata(
}
if (ob->type == OB_MESH) {
- Mesh *mesh_applied;
Mesh *me = ob->data;
MultiresModifierData *mmd = find_multires_modifier_before(scene, md_eval);
@@ -767,7 +766,7 @@ static bool modifier_apply_obdata(
}
}
else {
- mesh_applied = modifier_apply_create_mesh_for_modifier(depsgraph, ob, md_eval, true);
+ Mesh *mesh_applied = modifier_apply_create_mesh_for_modifier(depsgraph, ob, md_eval, true);
if (!mesh_applied) {
BKE_report(reports, RPT_ERROR, "Modifier returned error, skipping apply");
return false;
@@ -911,7 +910,8 @@ bool ED_object_modifier_copy(
ReportList *UNUSED(reports), Main *bmain, Scene *scene, Object *ob, ModifierData *md)
{
if (md->type == eModifierType_ParticleSystem) {
- nmd = object_copy_particle_system(bmain, scene, ob, ((ParticleSystemModifierData *)md)->psys);
+ ModifierData *nmd = object_copy_particle_system(
+ bmain, scene, ob, ((ParticleSystemModifierData *)md)->psys);
BLI_remlink(&ob->modifiers, nmd);
BLI_insertlinkafter(&ob->modifiers, md, nmd);
BKE_object_modifier_set_active(ob, nmd);
More information about the Bf-blender-cvs
mailing list