diff options
author | Yevgeny Makarov <jenkm> | 2021-02-24 22:49:14 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-02-24 22:49:14 +0300 |
commit | a50f6bc40b65b72381546d4ca0f3b617798577cf (patch) | |
tree | a452da2bdb922c3d2143b2b3a6b46b4a01c8841d /source/blender/makesrna | |
parent | 962b87f06a8e3dfadf86ca93ca2083db7866b98e (diff) |
UI: Clean up "Dupli" to "Instance"
Following the naming conventions defined in T56648, where in this
instance there were still a few remaining uses of the old term.
Differential Revision: https://developer.blender.org/D9817
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_depsgraph.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c index aab81b2bd1f..36d39c5c201 100644 --- a/source/blender/makesrna/intern/rna_depsgraph.c +++ b/source/blender/makesrna/intern/rna_depsgraph.c @@ -570,7 +570,7 @@ static void rna_def_depsgraph_instance(BlenderRNA *brna) prop = RNA_def_property(srna, "random_id", PROP_INT, PROP_UNSIGNED); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE); RNA_def_property_ui_text( - prop, "Dupli random id", "Random id for this instance, typically for randomized shading"); + prop, "Instance Random ID", "Random id for this instance, typically for randomized shading"); RNA_def_property_int_funcs(prop, "rna_DepsgraphObjectInstance_random_id_get", NULL, NULL); prop = RNA_def_property(srna, "matrix_world", PROP_FLOAT, PROP_MATRIX); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 46fdfe4a862..b8a3f0878b1 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -5222,7 +5222,7 @@ static void def_sh_tex_coord(StructRNA *srna) prop = RNA_def_property(srna, "from_instancer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1); RNA_def_property_ui_text( - prop, "From Instancer", "Use the parent of the dupli object if possible"); + prop, "From Instancer", "Use the parent of the instance object if possible"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } @@ -5554,7 +5554,7 @@ static void def_sh_uvmap(StructRNA *srna) prop = RNA_def_property(srna, "from_instancer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1); RNA_def_property_ui_text( - prop, "From Instancer", "Use the parent of the dupli object if possible"); + prop, "From Instancer", "Use the parent of the instance object if possible"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); RNA_def_struct_sdna_from(srna, "NodeShaderUVMap", "storage"); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 1952029d793..9e8a2b83f07 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -1922,13 +1922,13 @@ static void rna_def_particle_dupliweight(BlenderRNA *brna) srna = RNA_def_struct(brna, "ParticleDupliWeight", NULL); RNA_def_struct_ui_text( - srna, "Particle Dupliobject Weight", "Weight of a particle dupliobject in a collection"); + srna, "Particle Instance Object Weight", "Weight of a particle instance object in a collection"); RNA_def_struct_sdna(srna, "ParticleDupliWeight"); prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs( prop, "rna_ParticleDupliWeight_name_get", "rna_ParticleDupliWeight_name_length", NULL); - RNA_def_property_ui_text(prop, "Name", "Particle dupliobject name"); + RNA_def_property_ui_text(prop, "Name", "Particle instance object name"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_struct_name_property(srna, prop); @@ -3457,32 +3457,32 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY); RNA_def_property_ui_text( - prop, "Dupli Collection", "Show Objects in this collection in place of particles"); + prop, "Instance Collection", "Show objects in this collection in place of particles"); RNA_def_property_update(prop, 0, "rna_Particle_redo_count"); prop = RNA_def_property(srna, "instance_weights", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "instance_weights", NULL); RNA_def_property_struct_type(prop, "ParticleDupliWeight"); RNA_def_property_ui_text( - prop, "Dupli Collection Weights", "Weights for all of the objects in the dupli collection"); + prop, "Instance Collection Weights", "Weights for all of the objects in the instance collection"); prop = RNA_def_property(srna, "active_instanceweight", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "ParticleDupliWeight"); RNA_def_property_pointer_funcs(prop, "rna_ParticleDupliWeight_active_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, "Active Dupli Object", ""); + RNA_def_property_ui_text(prop, "Active Instance Object", ""); prop = RNA_def_property(srna, "active_instanceweight_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_ParticleDupliWeight_active_index_get", "rna_ParticleDupliWeight_active_index_set", "rna_ParticleDupliWeight_active_index_range"); - RNA_def_property_ui_text(prop, "Active Dupli Object Index", ""); + RNA_def_property_ui_text(prop, "Active Instance Object Index", ""); prop = RNA_def_property(srna, "instance_object", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Object"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY); - RNA_def_property_ui_text(prop, "Instance Object", "Show this Object in place of particles"); + RNA_def_property_ui_text(prop, "Instance Object", "Show this object in place of particles"); RNA_def_property_update(prop, 0, "rna_Particle_redo_dependency"); /* boids */ |