Revision: 41528
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41528
Author: nazgul
Date: 2011-11-04 15:53:20 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Fix #29024: Logic Bricks allow same name for multiple bricks
Check for unique name when setting name for logic bricks.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_controller.c
trunk/blender/source/blender/makesrna/intern/rna_sensor.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2011-11-04
15:53:12 UTC (rev 41527)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c 2011-11-04
15:53:20 UTC (rev 41528)
@@ -109,6 +109,18 @@
}
}
+void rna_Actuator_name_set(PointerRNA *ptr, const char *value)
+{
+ bActuator *act= (bActuator *)ptr->data;
+
+ BLI_strncpy_utf8(act->name, value, sizeof(act->name));
+
+ if (ptr->id.data) {
+ Object *ob= (Object *)ptr->id.data;
+ BLI_uniquename(&ob->actuators, act, "Actuator", '.',
offsetof(bActuator, name), sizeof(act->name));
+ }
+}
+
static void rna_Actuator_type_set(struct PointerRNA *ptr, int value)
{
bActuator *act= (bActuator *)ptr->data;
@@ -525,6 +537,7 @@
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(prop, "Name", "");
+ RNA_def_property_string_funcs(prop, NULL, NULL,
"rna_Actuator_name_set");
RNA_def_struct_name_property(srna, prop);
prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_controller.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_controller.c
2011-11-04 15:53:12 UTC (rev 41527)
+++ trunk/blender/source/blender/makesrna/intern/rna_controller.c
2011-11-04 15:53:20 UTC (rev 41528)
@@ -75,6 +75,18 @@
}
}
+void rna_Constroller_name_set(PointerRNA *ptr, const char *value)
+{
+ bController *cont= (bController *)ptr->data;
+
+ BLI_strncpy_utf8(cont->name, value, sizeof(cont->name));
+
+ if (ptr->id.data) {
+ Object *ob= (Object *)ptr->id.data;
+ BLI_uniquename(&ob->controllers, cont, "Controller", '.',
offsetof(bController, name), sizeof(cont->name));
+ }
+}
+
static void rna_Controller_type_set(struct PointerRNA *ptr, int value)
{
bController *cont= (bController *)ptr->data;
@@ -177,6 +189,7 @@
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(prop, "Name", "");
+ RNA_def_property_string_funcs(prop, NULL, NULL,
"rna_Constroller_name_set");
RNA_def_struct_name_property(srna, prop);
RNA_def_property_update(prop, NC_LOGIC, NULL);
Modified: trunk/blender/source/blender/makesrna/intern/rna_sensor.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sensor.c 2011-11-04
15:53:12 UTC (rev 41527)
+++ trunk/blender/source/blender/makesrna/intern/rna_sensor.c 2011-11-04
15:53:20 UTC (rev 41528)
@@ -102,6 +102,18 @@
}
}
+void rna_Sensor_name_set(PointerRNA *ptr, const char *value)
+{
+ bSensor *sens= (bSensor *)ptr->data;
+
+ BLI_strncpy_utf8(sens->name, value, sizeof(sens->name));
+
+ if (ptr->id.data) {
+ Object *ob= (Object *)ptr->id.data;
+ BLI_uniquename(&ob->sensors, sens, "Sensor", '.',
offsetof(bSensor, name), sizeof(sens->name));
+ }
+}
+
static void rna_Sensor_type_set(struct PointerRNA *ptr, int value)
{
bSensor *sens= (bSensor *)ptr->data;
@@ -260,6 +272,7 @@
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(prop, "Name", "Sensor name");
+ RNA_def_property_string_funcs(prop, NULL, NULL, "rna_Sensor_name_set");
RNA_def_struct_name_property(srna, prop);
RNA_def_property_update(prop, NC_LOGIC, NULL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
