[Bf-blender-cvs] [f98e4cbedbb] master: Preferences: remove author field
Campbell Barton
noreply at git.blender.org
Fri Jan 11 01:10:49 CET 2019
Commit: f98e4cbedbb73d22b649275208e0318838dea089
Author: Campbell Barton
Date: Fri Jan 11 11:00:33 2019 +1100
Branches: master
https://developer.blender.org/rBf98e4cbedbb73d22b649275208e0318838dea089
Preferences: remove author field
This was only used by collada export metadata.
If metadata like this is needed, we can use per-filetype preferences,
to make it clear when user identifiable information is being used.
===================================================================
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/collada/DocumentExporter.cpp
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index e7d8cd859c3..6abf2e92da8 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1263,7 +1263,6 @@ class USERPREF_PT_file_saveload(PreferencePanel):
flow.prop(paths, "save_version")
flow.prop(paths, "recent_files")
- flow.prop(paths, "author", text="Author")
class USERPREF_PT_file_saveload_autosave(PreferencePanel):
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index 4d0dd7605f9..a59a87b615e 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -243,12 +243,7 @@ int DocumentExporter::exportCurrentScene()
asset.setUnit(unitname, linearmeasure);
asset.setUpAxisType(COLLADASW::Asset::Z_UP);
- if (U.author[0] != '\0') {
- asset.getContributor().mAuthor = U.author;
- }
- else {
- asset.getContributor().mAuthor = "Blender User";
- }
+ asset.getContributor().mAuthor = "Blender User";
char version_buf[128];
#ifdef WITH_BUILDINFO
BLI_snprintf(version_buf, sizeof(version_buf), "Blender %d.%02d.%d commit date:%s, commit time:%s, hash:%s",
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 85fdc87d762..301dba3fac2 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -744,9 +744,6 @@ typedef struct UserDef {
short tweak_threshold;
char navigation_mode, pad10;
- /** Author name for file formats supporting it. */
- char author[80];
-
char font_path_ui[1024];
char font_path_ui_mono[1024];
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 157bbf16a24..7600c6c98d1 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4924,12 +4924,6 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
"(unsafe with blend files from an untrusted source)");
RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
- prop = RNA_def_property(srna, "author", PROP_STRING, PROP_NONE);
- RNA_def_property_string_sdna(prop, NULL, "author");
- RNA_def_property_string_maxlength(prop, 80);
- RNA_def_property_ui_text(prop, "Author",
- "Name that will be used in exported files when format supports such feature");
-
prop = RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
RNA_def_property_ui_text(prop, "Tabs as Spaces",
More information about the Bf-blender-cvs
mailing list