diff options
author | Martin Felke <martin.felke@googlemail.com> | 2018-02-22 15:02:34 +0300 |
---|---|---|
committer | Martin Felke <martin.felke@googlemail.com> | 2018-02-22 15:02:34 +0300 |
commit | fb4fcd6e0137ef2785b8ceae203921ec359b1263 (patch) | |
tree | ecc36828bc66e7a793fe1a08b66825b2cb158e00 /source/blender/makesdna/intern/makesdna.c | |
parent | ae358f92e6ea9fd82ee9ec463fb31cae005952a9 (diff) | |
parent | 8928d99270ff0dcafe23605221f271308e33f297 (diff) |
Merge remote-tracking branch 'refs/remotes/origin/blender-v2.79a-release' into fracture_modifier
Conflicts:
source/blender/modifiers/intern/MOD_boolean.c
Diffstat (limited to 'source/blender/makesdna/intern/makesdna.c')
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 9272f16cc0d..ae6c269bc7d 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -979,7 +979,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs char str[SDNA_MAX_FILENAME_LENGTH], *cp; int firststruct; - if (debugSDNA > -1) { + if (debugSDNA > 0) { fflush(stdout); printf("Running makesdna at debug level %d\n", debugSDNA); } @@ -1075,7 +1075,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs /* file writing */ - if (debugSDNA > -1) printf("Writing file ... "); + if (debugSDNA > 0) printf("Writing file ... "); if (nr_names == 0 || nr_structs == 0) { /* pass */ @@ -1185,7 +1185,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs MEM_freeN(typelens_64); MEM_freeN(structs); - if (debugSDNA > -1) printf("done.\n"); + if (debugSDNA > 0) printf("done.\n"); return(0); } |