diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_sensor.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_sensor.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_sensor.c b/source/blender/makesrna/intern/rna_sensor.c index 3944b59dff7..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) @@ -246,11 +242,11 @@ static void rna_Sensor_Armature_update(Main *UNUSED(bmain), Scene *UNUSED(scene) bPoseChannel *pchan; bPose *pose = ob->pose; for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) { - if (!strcmp(pchan->name, posechannel)) { + if (STREQ(pchan->name, posechannel)) { /* found it, now look for constraint channel */ bConstraint *con; for (con = pchan->constraints.first; con; con = con->next) { - if (!strcmp(con->name, constraint)) { + if (STREQ(con->name, constraint)) { /* found it, all ok */ return; } |