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:
authorAras Pranckevicius <aras_p>2022-03-19 23:20:22 +0300
committerAras Pranckevicius <aras@nesnausk.org>2022-03-23 13:58:21 +0300
commit3a1e6bc1d5807b732536c73170f11268fb398726 (patch)
tree41741ea988a65524056fe643f0f74be0c2980724 /source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
parentfc0a07da29edf79e2ad684c696fd03f382c51884 (diff)
Fix T96430: new OBJ exporter wrong normals for non-uniform scale, and wrong face order for negative scale
The new 3.1+ OBJ exporter did not have correct logic when faced with non-uniform & mirrored (negative on odd number of axes) object scale: - Normals were not transformed correctly (should use inverse transpose of the matrix), and were not normalized, - Face order was not "flipped" when transform has negative scale on odd number of axes (visible when using "face orientation" viewport overlay). Cherry-picked from 8aa365745a78, with minor conflict fixes. Reviewed By: Howard Trickey Differential Revision: https://developer.blender.org/D14343
Diffstat (limited to 'source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc')
-rw-r--r--source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
index 66f10009875..c1b9b0a8ccf 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -125,6 +125,13 @@ void OBJMesh::set_world_axes_transform(const eTransformAxisForward forward,
/* mul_m4_m3m4 does not transform last row of obmat, i.e. location data. */
mul_v3_m3v3(world_and_axes_transform_[3], axes_transform, export_object_eval_.obmat[3]);
world_and_axes_transform_[3][3] = export_object_eval_.obmat[3][3];
+
+ /* Normals need inverse transpose of the regular matrix to handle non-uniform scale. */
+ float normal_matrix[3][3];
+ copy_m3_m4(normal_matrix, world_and_axes_transform_);
+ invert_m3_m3(world_and_axes_normal_transform_, normal_matrix);
+ transpose_m3(world_and_axes_normal_transform_);
+ mirrored_transform_ = determinant_m3_array(world_and_axes_normal_transform_) < 0;
}
int OBJMesh::tot_vertices() const
@@ -322,7 +329,8 @@ float3 OBJMesh::calc_poly_normal(const int poly_index) const
const MLoop &mloop = export_mesh_eval_->mloop[poly.loopstart];
const MVert &mvert = *(export_mesh_eval_->mvert);
BKE_mesh_calc_poly_normal(&poly, &mloop, &mvert, r_poly_normal);
- mul_mat3_m4_v3(world_and_axes_transform_, r_poly_normal);
+ mul_m3_v3(world_and_axes_normal_transform_, r_poly_normal);
+ normalize_v3(r_poly_normal);
return r_poly_normal;
}
@@ -367,7 +375,8 @@ void OBJMesh::store_normal_coords_and_indices(Vector<float3> &r_normal_coords)
int loop_index = mpoly.loopstart + loop_of_poly;
BLI_assert(loop_index < export_mesh_eval_->totloop);
copy_v3_v3(loop_normal, lnors[loop_index]);
- mul_mat3_m4_v3(world_and_axes_transform_, loop_normal);
+ mul_m3_v3(world_and_axes_normal_transform_, loop_normal);
+ normalize_v3(loop_normal);
float3 rounded_loop_normal = round_float3_to_n_digits(loop_normal, round_digits);
int loop_norm_index = normal_to_index.lookup_default(rounded_loop_normal, -1);
if (loop_norm_index == -1) {