blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

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
This commit is contained in:
Yevgeny Makarov 2021-02-24 13:49:14 -06:00 committed by Hans Goudey
parent 962b87f06a
commit a50f6bc40b
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/object/object_add.c
View File

@ -2404,7 +2404,7 @@ void OBJECT_OT_duplicates_make_real(wmOperatorType *ot)
"use_base_parent",
0,
"Parent",
"Parent newly created objects to the original duplicator");
"Parent newly created objects to the original instancer");
RNA_def_boolean(
ot->srna, "use_hierarchy", 0, "Keep Hierarchy", "Maintain parent child relationships");
}

20
source/blender/editors/physics/particle_object.c
View File

@ -416,9 +416,9 @@ static int dupliob_refresh_exec(bContext *C, wmOperator *UNUSED(op))
void PARTICLE_OT_dupliob_refresh(wmOperatorType *ot)
{
ot->name = "Refresh Dupli Objects";
ot->name = "Refresh Instance Objects";
ot->idname = "PARTICLE_OT_dupliob_refresh";
ot->description = "Refresh list of dupli objects and their weights";
ot->description = "Refresh list of instance objects and their weights";
ot->exec = dupliob_refresh_exec;
@ -456,9 +456,9 @@ static int dupliob_move_up_exec(bContext *C, wmOperator *UNUSED(op))
void PARTICLE_OT_dupliob_move_up(wmOperatorType *ot)
{
ot->name = "Move Up Dupli Object";
ot->name = "Move Up Instance Object";
ot->idname = "PARTICLE_OT_dupliob_move_up";
ot->description = "Move dupli object up in the list";
ot->description = "Move instance object up in the list";
ot->exec = dupliob_move_up_exec;
@ -498,9 +498,9 @@ static int copy_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op))
void PARTICLE_OT_dupliob_copy(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Copy Particle Dupliob";
ot->name = "Copy Particle Instance Object";
ot->idname = "PARTICLE_OT_dupliob_copy";
ot->description = "Duplicate the current dupliobject";
ot->description = "Duplicate the current instance object";
/* api callbacks */
ot->exec = copy_particle_dupliob_exec;
@ -543,9 +543,9 @@ static int remove_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op))
void PARTICLE_OT_dupliob_remove(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Remove Particle Dupliobject";
ot->name = "Remove Particle Instance Object";
ot->idname = "PARTICLE_OT_dupliob_remove";
ot->description = "Remove the selected dupliobject";
ot->description = "Remove the selected instance object";
/* api callbacks */
ot->exec = remove_particle_dupliob_exec;
@ -584,9 +584,9 @@ static int dupliob_move_down_exec(bContext *C, wmOperator *UNUSED(op))
void PARTICLE_OT_dupliob_move_down(wmOperatorType *ot)
{
ot->name = "Move Down Dupli Object";
ot->name = "Move Down Instance Object";
ot->idname = "PARTICLE_OT_dupliob_move_down";
ot->description = "Move dupli object down in the list";
ot->description = "Move instance object down in the list";
ot->exec = dupliob_move_down_exec;

2
source/blender/makesrna/intern/rna_depsgraph.c
View File

@ -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);

4
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -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");

14
source/blender/makesrna/intern/rna_particle.c
View File

@ -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 */