commit 89844de13ba6e7f21fa6908fc69847457012576f
parent 2a9b2dc40ba0a95f4cc590287bf44c88dc381bd7
Author: vaplv <vaplv@free.fr>
Date: Fri, 21 Feb 2020 15:59:10 +0100
Merge branch 'release_2.0_rc1'
Diffstat:
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -70,7 +70,7 @@ if(NOT NO_TEST)
add_executable(test_aw_obj ${AW_SOURCE_DIR}/test_aw_obj.c)
target_link_libraries(test_aw_obj aw)
add_test(test_aw_obj test_aw_obj)
- # rcmake_set_test_runtime_dirs(test_aw_obj _runtime_dirs)
+ rcmake_set_test_runtime_dirs(test_aw_obj _runtime_dirs)
add_executable(test_aw_mtl ${AW_SOURCE_DIR}/test_aw_mtl.c)
target_link_libraries(test_aw_mtl aw)
diff --git a/src/aw_mtl.c b/src/aw_mtl.c
@@ -234,9 +234,6 @@ struct aw_mtl {
struct darray_material materials;
struct material* newmtl; /* Pointer toward the current material */
- const char* filename; /* Currently parsed file. Use in error messages */
- size_t iline; /* Currently parsed line index. Use in error messages */
-
ref_T ref;
struct mem_allocator* allocator;
struct logger* logger;