diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/unit.c | 6 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_mask.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 18 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 4 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_props.c | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 3fd47b515f6..1d4980283d9 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -595,9 +595,9 @@ static const char *unit_find_str(const char *str, const char *substr) /* Note that numbers are added within brackets * ") " - is used to detect numbers we added so we can detect if commas need to be added * - * "1m1cm+2mm" - Original value - * "1*1#1*0.01#+2*0.001#" - Replace numbers - * "1*1+1*0.01 +2*0.001 " - Add add signs if ( + - * / | & ~ < > ^ ! = % ) not found in between + * "1m1cm+2mm" - Original value + * "1*1#1*0.01#+2*0.001#" - Replace numbers + * "1*1+1*0.01 +2*0.001 " - Add add signs if ( + - * / | & ~ < > ^ ! = % ) not found in between * */ diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index dddf25696b3..54f269a35f0 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10850,9 +10850,9 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) while (fd == NULL) { char newlib_path[FILE_MAX] = {0}; printf("Missing library...'\n"); - printf(" current file: %s\n", BKE_main_blendfile_path_from_global()); - printf(" absolute lib: %s\n", mainptr->curlib->filepath); - printf(" relative lib: %s\n", mainptr->curlib->name); + printf("\tcurrent file: %s\n", BKE_main_blendfile_path_from_global()); + printf("\tabsolute lib: %s\n", mainptr->curlib->filepath); + printf("\trelative lib: %s\n", mainptr->curlib->name); printf(" enter a new path:\n"); if (scanf("%1023s", newlib_path) > 0) { /* Warning, keep length in sync with FILE_MAX! */ diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c index 31d195ebdbd..23f038c6078 100644 --- a/source/blender/makesrna/intern/rna_mask.c +++ b/source/blender/makesrna/intern/rna_mask.c @@ -32,7 +32,7 @@ #include "MEM_guardedalloc.h" #include "DNA_mask_types.h" -#include "DNA_object_types.h" /* SELECT */ +#include "DNA_object_types.h" /* SELECT */ #include "DNA_scene_types.h" #include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index f25e093c8a9..e0decfbc39d 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -367,15 +367,15 @@ void RNA_api_scene(StructRNA *srna) RNA_def_int(func, "geom_samples", 1, 1, 128, "Geom samples", "Geometry samples per frame", 1, 128); RNA_def_float(func, "shutter_open", 0.0f, -1.0f, 1.0f, "Shutter open", "", -1.0f, 1.0f); RNA_def_float(func, "shutter_close", 1.0f, -1.0f, 1.0f, "Shutter close", "", -1.0f, 1.0f); - RNA_def_boolean(func, "selected_only" , 0, "Selected only", "Export only selected objects"); - RNA_def_boolean(func, "uvs" , 1, "UVs", "Export UVs"); - RNA_def_boolean(func, "normals" , 1, "Normals", "Export normals"); - RNA_def_boolean(func, "vcolors" , 0, "Vertex colors", "Export vertex colors"); - RNA_def_boolean(func, "apply_subdiv" , 1, "Subsurfs as meshes", "Export subdivision surfaces as meshes"); - RNA_def_boolean(func, "flatten" , 0, "Flatten hierarchy", "Flatten hierarchy"); - RNA_def_boolean(func, "visible_layers_only" , 0, "Visible layers only", "Export only objects in visible layers"); - RNA_def_boolean(func, "renderable_only" , 0, "Renderable objects only", "Export only objects marked renderable in the outliner"); - RNA_def_boolean(func, "face_sets" , 0, "Facesets", "Export face sets"); + RNA_def_boolean(func, "selected_only", 0, "Selected only", "Export only selected objects"); + RNA_def_boolean(func, "uvs", 1, "UVs", "Export UVs"); + RNA_def_boolean(func, "normals", 1, "Normals", "Export normals"); + RNA_def_boolean(func, "vcolors", 0, "Vertex colors", "Export vertex colors"); + RNA_def_boolean(func, "apply_subdiv", 1, "Subsurfs as meshes", "Export subdivision surfaces as meshes"); + RNA_def_boolean(func, "flatten", 0, "Flatten hierarchy", "Flatten hierarchy"); + RNA_def_boolean(func, "visible_layers_only", 0, "Visible layers only", "Export only objects in visible layers"); + RNA_def_boolean(func, "renderable_only", 0, "Renderable objects only", "Export only objects marked renderable in the outliner"); + RNA_def_boolean(func, "face_sets", 0, "Facesets", "Export face sets"); RNA_def_boolean(func, "subdiv_schema", 0, "Use Alembic subdivision Schema", "Use Alembic subdivision Schema"); RNA_def_boolean(func, "export_hair", 1, "Export Hair", "Exports hair particle systems as animated curves"); RNA_def_boolean(func, "export_particles", 1, "Export Particles", "Exports non-hair particle systems"); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d18ffd422e0..2739f10c228 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -3741,7 +3741,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); prop = RNA_def_property(srna, "show_metadata", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_SHOW_METADATA); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_SHOW_METADATA); RNA_def_property_ui_text(prop, "Show Metadata", "Show metadata of first visible strip"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); @@ -5095,7 +5095,7 @@ static void rna_def_space_clip(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL); prop = RNA_def_property(srna, "show_metadata", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_SHOW_METADATA); + RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_SHOW_METADATA); RNA_def_property_ui_text(prop, "Show Metadata", "Show metadata of clip"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL); diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 0bd82d3c52b..b7242680dca 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -1905,7 +1905,7 @@ static void bpy_prop_callback_assign_enum(struct PropertyRNA *prop, PyObject *ge #define BPY_PROPDEF_UNIT_DOC \ " :arg unit: Enumerator in ['NONE', 'LENGTH', 'AREA', 'VOLUME', 'ROTATION', 'TIME', 'VELOCITY', 'ACCELERATION', 'MASS', 'CAMERA'].\n" \ -" :type unit: string\n" \ +" :type unit: string\n" \ #define BPY_PROPDEF_NUM_MIN_DOC \ " :arg min: Hard minimum, trying to assign a value below will silently assign this minimum instead.\n" \ |