diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-17 22:20:22 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-17 22:20:22 +0300 |
| commit | a640587e25e43be8007fa0090a59fd9bb6d51e39 (patch) | |
| tree | ef780ec436232535a9e36ac233de1792ee8ba9e4 /source/blender/makesrna/intern/rna_space.c | |
| parent | 99eb95337f74f1a303c774902ea29f7d378bac1b (diff) | |
| parent | 892637f60afbbb787334caa26f5342baf1d4a7d7 (diff) | |
Merge branch 'temp-openxr-blenderside' into soc-2019-openxrsoc-2019-openxr
Diffstat (limited to 'source/blender/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 89e1babde7d..66aeab725ea 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -3958,19 +3958,19 @@ static void rna_def_space_view3d(BlenderRNA *brna) prop = RNA_def_property(srna, "lock_object", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_pointer_sdna(prop, NULL, "ob_centre"); + RNA_def_property_pointer_sdna(prop, NULL, "ob_center"); RNA_def_property_ui_text( prop, "Lock to Object", "3D View center is locked to this object's position"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "lock_bone", PROP_STRING, PROP_NONE); - RNA_def_property_string_sdna(prop, NULL, "ob_centre_bone"); + RNA_def_property_string_sdna(prop, NULL, "ob_center_bone"); RNA_def_property_ui_text( prop, "Lock to Bone", "3D View center is locked to this bone's position"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "lock_cursor", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "ob_centre_cursor", 1); + RNA_def_property_boolean_sdna(prop, NULL, "ob_center_cursor", 1); RNA_def_property_ui_text( prop, "Lock to Cursor", "3D View center is locked to the cursor's position"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); @@ -4376,7 +4376,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_api_region_view3d(srna); } -static void rna_def_space_buttons(BlenderRNA *brna) +static void rna_def_space_properties(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; @@ -6515,7 +6515,7 @@ void RNA_def_space(BlenderRNA *brna) rna_def_space_filebrowser(brna); rna_def_space_outliner(brna); rna_def_space_view3d(brna); - rna_def_space_buttons(brna); + rna_def_space_properties(brna); rna_def_space_dopesheet(brna); rna_def_space_graph(brna); rna_def_space_nla(brna); |