Commit: c2e43ca99a278ca49410759c035aeb7d48ac3f24
Author: Ankit Meel
Date: Tue Jun 30 02:13:30 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBc2e43ca99a278ca49410759c035aeb7d48ac3f24
Remove axis transform defines and use existing enums
===================================================================
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
===================================================================
diff --git
a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
index b4c6212f106..9953328803d 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
@@ -115,8 +115,9 @@ void OBJMesh::store_world_axes_transform()
{
float axes_transform[3][3];
unit_m3(axes_transform);
- mat3_from_axis_conversion(DEFAULT_AXIS_FORWARD,
- DEFAULT_AXIS_UP,
+ /* -Y-forward and +Z-up are the default Blender axis settings. */
+ mat3_from_axis_conversion(OBJ_AXIS_NEGATIVE_Y_FORWARD,
+ OBJ_AXIS_Z_UP,
_export_params->forward_axis,
_export_params->up_axis,
axes_transform);
diff --git
a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
index 55ce8f0cf80..bb5e7b99930 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
@@ -37,11 +37,6 @@
namespace blender {
namespace io {
namespace obj {
-/* -Y */
-#define DEFAULT_AXIS_FORWARD 4
-/* Z */
-#define DEFAULT_AXIS_UP 2
-
class OBJMesh {
public:
OBJMesh(bContext *C, const OBJExportParams *export_params, Object
*export_object)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
