[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41028] trunk/blender/source/blender/ makesrna/intern/rna_particle.c: keep particle system names unique

Campbell Barton ideasman42 at gmail.com
Sat Oct 15 13:55:09 CEST 2011


Revision: 41028
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41028
Author:   campbellbarton
Date:     2011-10-15 11:55:09 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
keep particle system names unique

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_particle.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c	2011-10-15 11:07:18 UTC (rev 41027)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c	2011-10-15 11:55:09 UTC (rev 41028)
@@ -505,6 +505,17 @@
 	return part->type == PART_FLUID;
 }
 
+void rna_ParticleSystem_name_set(PointerRNA *ptr, const char *value)
+{
+	Object *ob= ptr->id.data;
+	ParticleSystem *part= (ParticleSystem*)ptr->data;
+
+	/* copy the new name into the name slot */
+	BLI_strncpy_utf8(part->name, value, sizeof(part->name));
+
+	BLI_uniquename(&ob->particlesystem, part, "ParticleSystem", '.', offsetof(ParticleSystem, name), sizeof(part->name));
+}
+
 static PointerRNA rna_ParticleSystem_active_particle_target_get(PointerRNA *ptr)
 {
 	ParticleSystem *psys= (ParticleSystem*)ptr->data;
@@ -2617,6 +2628,7 @@
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Name", "Particle system name");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER|NA_RENAME, NULL);
+	RNA_def_property_string_funcs(prop, NULL, NULL, "rna_ParticleSystem_name_set");
 	RNA_def_struct_name_property(srna, prop);
 
 	/* access to particle settings is redirected through functions */




More information about the Bf-blender-cvs mailing list