[Bf-blender-cvs] [326bd76d3b6] master: Fix T89759: baking normals does not take into account mirror modifier
Brecht Van Lommel
noreply at git.blender.org
Mon Oct 4 14:09:53 CEST 2021
Commit: 326bd76d3b6d75d34fa3a6313ff0db374446d4ab
Author: Brecht Van Lommel
Date: Mon Oct 4 13:50:29 2021 +0200
Branches: master
https://developer.blender.org/rB326bd76d3b6d75d34fa3a6313ff0db374446d4ab
Fix T89759: baking normals does not take into account mirror modifier
===================================================================
M source/blender/editors/object/object_bake_api.c
===================================================================
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 26f5b21a311..475e0e581fb 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -1532,22 +1532,22 @@ static int bake(const BakeAPIRender *bkr,
if (md) {
mode = md->mode;
md->mode &= ~eModifierMode_Render;
- }
- /* Evaluate modifiers again. */
- me_nores = BKE_mesh_new_from_object(NULL, ob_low_eval, false, false);
- bake_targets_populate_pixels(bkr, &targets, ob_low, me_nores, pixel_array_low);
+ /* Evaluate modifiers again. */
+ me_nores = BKE_mesh_new_from_object(NULL, ob_low_eval, false, false);
+ bake_targets_populate_pixels(bkr, &targets, ob_low, me_nores, pixel_array_low);
+ }
RE_bake_normal_world_to_tangent(pixel_array_low,
targets.num_pixels,
targets.num_channels,
targets.result,
- me_nores,
+ (me_nores) ? me_nores : me_low_eval,
bkr->normal_swizzle,
ob_low_eval->obmat);
- BKE_id_free(NULL, &me_nores->id);
if (md) {
+ BKE_id_free(NULL, &me_nores->id);
md->mode = mode;
}
}
More information about the Bf-blender-cvs
mailing list