diff options
author | Jorge Bernal <jbernalmartinez@gmail.com> | 2015-01-29 08:03:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-29 08:43:20 +0300 |
commit | 072d80a9de3adef632b8637649b169c4a895c1b9 (patch) | |
tree | f3b82fe2120242a5ce636e0fa298bb058649e960 /source/blender/makesrna | |
parent | 65574b0b030fd1a893520fe967e580ed00308cb5 (diff) |
Fix T42858: Non uniform gamelogic names on copy
Use generic function for consistent behavior
D949 by @lordloki
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_controller.c | 11 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_property.c | 11 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sensor.c | 10 |
4 files changed, 18 insertions, 24 deletions
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index 9c7d66d00c7..691a7432275 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -120,14 +120,10 @@ static StructRNA *rna_Actuator_refine(struct PointerRNA *ptr) static void rna_Actuator_name_set(PointerRNA *ptr, const char *value) { - bActuator *act = (bActuator *)ptr->data; - + Object *ob = ptr->id.data; + bActuator *act = 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, DATA_("Actuator"), '.', offsetof(bActuator, name), sizeof(act->name)); - } + BLI_uniquename(&ob->actuators, act, DATA_("Actuator"), '.', offsetof(bActuator, name), sizeof(act->name)); } static void rna_Actuator_type_set(struct PointerRNA *ptr, int value) diff --git a/source/blender/makesrna/intern/rna_controller.c b/source/blender/makesrna/intern/rna_controller.c index 8b5074eaf0d..ba0214d36ec 100644 --- a/source/blender/makesrna/intern/rna_controller.c +++ b/source/blender/makesrna/intern/rna_controller.c @@ -85,15 +85,10 @@ static StructRNA *rna_Controller_refine(struct PointerRNA *ptr) static void rna_Constroller_name_set(PointerRNA *ptr, const char *value) { - bController *cont = (bController *)ptr->data; - + Object *ob = ptr->id.data; + bController *cont = 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, DATA_("Controller"), '.', offsetof(bController, name), - sizeof(cont->name)); - } + BLI_uniquename(&ob->controllers, cont, DATA_("Controller"), '.', offsetof(bController, name), sizeof(cont->name)); } static void rna_Controller_type_set(struct PointerRNA *ptr, int value) diff --git a/source/blender/makesrna/intern/rna_property.c b/source/blender/makesrna/intern/rna_property.c index c6b8e89c282..a2c19e55056 100644 --- a/source/blender/makesrna/intern/rna_property.c +++ b/source/blender/makesrna/intern/rna_property.c @@ -28,6 +28,11 @@ #include <stdlib.h> #include "DNA_property_types.h" +#include "DNA_object_types.h" + +#include "BLI_path_util.h" + +#include "BLF_translation.h" #include "RNA_define.h" #include "RNA_enum_types.h" @@ -97,9 +102,11 @@ static void rna_GameProperty_type_set(PointerRNA *ptr, int value) static void rna_GameProperty_name_set(PointerRNA *ptr, const char *value) { - bProperty *prop = (bProperty *)(ptr->data); + Object *ob = ptr->id.data; + bProperty *prop = ptr->data; BLI_strncpy_utf8(prop->name, value, sizeof(prop->name)); - BKE_bproperty_unique(NULL, prop, 1); + + BLI_uniquename(&ob->prop, prop, DATA_("Property"), '.', offsetof(bProperty, name), sizeof(prop->name)); } diff --git a/source/blender/makesrna/intern/rna_sensor.c b/source/blender/makesrna/intern/rna_sensor.c index 28b7b5fbcd8..5d7bb6d2d94 100644 --- a/source/blender/makesrna/intern/rna_sensor.c +++ b/source/blender/makesrna/intern/rna_sensor.c @@ -107,14 +107,10 @@ static StructRNA *rna_Sensor_refine(struct PointerRNA *ptr) static void rna_Sensor_name_set(PointerRNA *ptr, const char *value) { - bSensor *sens = (bSensor *)ptr->data; - + Object *ob = ptr->id.data; + bSensor *sens = 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, DATA_("Sensor"), '.', offsetof(bSensor, name), sizeof(sens->name)); - } + BLI_uniquename(&ob->sensors, sens, DATA_("Sensor"), '.', offsetof(bSensor, name), sizeof(sens->name)); } static void rna_Sensor_type_set(struct PointerRNA *ptr, int value) |