Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-01-09 08:10:58 +0300
committerHans Goudey <h.goudey@me.com>2021-01-09 08:10:58 +0300
commit645298be29601b0e772a15fe04c570a31df4a25d (patch)
tree0295d92344f0ccc40e2a6862792826ce7f2fca0c
parent1bb530745f84e0525ed50e65c56ba07060adb430 (diff)
Fix build error after last commit
-rw-r--r--source/blender/editors/object/object_modifier.c6
1 files changed, 3 insertions, 3 deletions
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);