diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_controller.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_controller.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_controller.c b/source/blender/makesrna/intern/rna_controller.c index 8b5074eaf0d..1a0f3c30b03 100644 --- a/source/blender/makesrna/intern/rna_controller.c +++ b/source/blender/makesrna/intern/rna_controller.c @@ -31,7 +31,7 @@ #include "BLI_utildefines.h" -#include "BLF_translation.h" +#include "BLT_translation.h" #include "RNA_define.h" #include "RNA_enum_types.h" @@ -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) @@ -125,7 +120,7 @@ static int rna_Controller_state_number_get(struct PointerRNA *ptr) int bit; for (bit = 0; bit < 32; bit++) { - if (cont->state_mask & (1 << bit)) + if (cont->state_mask & (1u << bit)) return bit + 1; } return 0; |