diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 18:05:02 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 18:05:02 +0400 |
commit | bf4deba4d5bdbad8611d2fdd7f796fe785cac4a5 (patch) | |
tree | cde0748edb0f4860d354a75067e6fd64034604d6 /source/blender/blenloader | |
parent | 07afa420f2f273c58d6d054b9026c92e0ac98785 (diff) | |
parent | 5b88e16306711408825d9291bfeb7023bd7fd69c (diff) |
svn merge ^/trunk/blender -r42927:42931
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 6f84d89c00a..c1759aa80fd 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -176,7 +176,7 @@ typedef struct { int tot, count, error, memsize; -#ifdef USE_MESH_FORWARDS_COMAT +#ifdef USE_BMESH_SAVE_AS_COMPAT char use_mesh_compat; /* option to save with older mesh format */ #endif } WriteData; @@ -2717,7 +2717,7 @@ static int write_file_handle(Main *mainvar, int handle, MemFile *compare, MemFil wd= bgnwrite(handle, compare, current); -#ifdef USE_MESH_FORWARDS_COMAT +#ifdef USE_BMESH_SAVE_AS_COMPAT wd->use_mesh_compat = (write_flags & G_FILE_MESH_COMPAT) != 0; #endif |