diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-28 12:35:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-28 12:35:24 +0300 |
commit | 604de7cbe8401ef781576eb587192a9d71ba35cf (patch) | |
tree | 91d576119a8ea1ae18e0597be7b0d757e6d4819e /source/blender | |
parent | 91034646c7c93e77c2ffda5e67e5ee0b23207fc9 (diff) | |
parent | 7c64e33b012935764ee5358c0e0a5b983d9a78b0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/mesh/editmesh_bevel.c | 1 | ||||
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 16 |
3 files changed, 18 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index e541df8ffa3..68fd4212004 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -623,6 +623,7 @@ void MESH_OT_bevel(wmOperatorType *ot) RNA_def_enum(ot->srna, "offset_type", offset_type_items, 0, "Amount Type", "What distance Amount measures"); prop = RNA_def_float(ot->srna, "offset", 0.0f, -1e6f, 1e6f, "Amount", "", 0.0f, 1.0f); RNA_def_property_float_array_funcs_runtime(prop, NULL, NULL, mesh_ot_bevel_offset_range_func); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); RNA_def_int(ot->srna, "segments", 1, 1, SEGMENTS_HARD_MAX, "Segments", "Segments for curved edge", 1, 8); RNA_def_float(ot->srna, "profile", 0.5f, PROFILE_HARD_MIN, 1.0f, "Profile", "Controls profile shape (0.5 = round)", PROFILE_HARD_MIN, 1.0f); diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 182a026df94..593d93b5615 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -993,7 +993,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); } @@ -1089,7 +1089,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 */ @@ -1199,7 +1199,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); } diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 293cef52b90..b927daf2ac0 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -46,6 +46,14 @@ # endif #endif +/** + * Variable to control debug output of makesrna. + * debugSRNA: + * - 0 = no output, except errors + * - 1 = detail actions + */ +static int debugSRNA = 0; + /* stub for BLI_abort() */ #ifndef NDEBUG void BLI_system_backtrace(FILE *fp) @@ -62,7 +70,9 @@ void BLI_system_backtrace(FILE *fp) static int file_older(const char *file1, const char *file2) { struct stat st1, st2; - /* printf("compare: %s %s\n", file1, file2); */ + if (debugSRNA > 0) { + printf("compare: %s %s\n", file1, file2); + } if (stat(file1, &st1)) return 0; if (stat(file2, &st2)) return 0; @@ -4141,7 +4151,9 @@ int main(int argc, char **argv) return_status = 1; } else { - fprintf(stderr, "Running makesrna\n"); + if (debugSRNA > 0) { + fprintf(stderr, "Running makesrna\n"); + } makesrna_path = argv[0]; return_status = rna_preprocess(argv[1]); } |