diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-04-04 18:33:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-04 18:33:41 +0400 |
commit | 97454d7b85e2be0259318e73a8d4ec662eb75985 (patch) | |
tree | 5740303bab516ac57c9b49545a4e6f869273908c /source/blender | |
parent | cddd6a56dd55c811bed08249d64d6797e62068ec (diff) |
no functional changes. use sizeof() and MAXFRAME
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesrna/intern/rna_armature.c | 14 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_constraint.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_key.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object_force.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_pose.c | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index 137e9cece2c..1ad63d63639 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -210,11 +210,11 @@ static void rna_EditBone_name_set(PointerRNA *ptr, const char *value) { bArmature *arm= (bArmature*)ptr->id.data; EditBone *ebone= (EditBone*)ptr->data; - char oldname[32], newname[32]; + char oldname[sizeof(ebone->name)], newname[sizeof(ebone->name)]; /* need to be on the stack */ - BLI_strncpy(newname, value, 32); - BLI_strncpy(oldname, ebone->name, 32); + BLI_strncpy(newname, value, sizeof(ebone->name)); + BLI_strncpy(oldname, ebone->name, sizeof(ebone->name)); ED_armature_bone_rename(arm, oldname, newname); } @@ -223,12 +223,12 @@ static void rna_Bone_name_set(PointerRNA *ptr, const char *value) { bArmature *arm= (bArmature*)ptr->id.data; Bone *bone= (Bone*)ptr->data; - char oldname[32], newname[32]; + char oldname[sizeof(bone->name)], newname[sizeof(bone->name)]; /* need to be on the stack */ - BLI_strncpy(newname, value, 32); - BLI_strncpy(oldname, bone->name, 32); - + BLI_strncpy(newname, value, sizeof(bone->name)); + BLI_strncpy(oldname, bone->name, sizeof(bone->name)); + ED_armature_bone_rename(arm, oldname, newname); } diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 6947c94872e..c61ebf5adfc 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -165,10 +165,10 @@ static StructRNA *rna_ConstraintType_refine(struct PointerRNA *ptr) static void rna_Constraint_name_set(PointerRNA *ptr, const char *value) { bConstraint *con= ptr->data; - char oldname[32]; + char oldname[sizeof(con->name)]; /* make a copy of the old name first */ - BLI_strncpy(oldname, con->name, sizeof(oldname)); + BLI_strncpy(oldname, con->name, sizeof(con->name)); /* copy the new name into the name slot */ BLI_strncpy(con->name, value, sizeof(con->name)); diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 47accb86d8f..7e9aebeffa4 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -64,10 +64,10 @@ static Key *rna_ShapeKey_find_key(ID *id) void rna_ShapeKey_name_set(PointerRNA *ptr, const char *value) { KeyBlock *kb= ptr->data; - char oldname[32]; + char oldname[sizeof(kb->name)]; /* make a copy of the old name first */ - BLI_strncpy(oldname, kb->name, sizeof(oldname)); + BLI_strncpy(oldname, kb->name, sizeof(kb->name)); /* copy the new name into the name slot */ BLI_strncpy(kb->name, value, sizeof(kb->name)); @@ -75,7 +75,7 @@ void rna_ShapeKey_name_set(PointerRNA *ptr, const char *value) /* make sure the name is truly unique */ if (ptr->id.data) { Key *key= rna_ShapeKey_find_key(ptr->id.data); - BLI_uniquename(&key->block, kb, "Key", '.', offsetof(KeyBlock, name), 32); + BLI_uniquename(&key->block, kb, "Key", '.', offsetof(KeyBlock, name), sizeof(kb->name)); } /* fix all the animation data which may link to this */ diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index e789d2d0c46..d4bc2d6c571 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -176,10 +176,10 @@ static StructRNA* rna_Modifier_refine(struct PointerRNA *ptr) void rna_Modifier_name_set(PointerRNA *ptr, const char *value) { ModifierData *md= ptr->data; - char oldname[32]; + char oldname[sizeof(md->name)]; /* make a copy of the old name first */ - BLI_strncpy(oldname, md->name, sizeof(oldname)); + BLI_strncpy(oldname, md->name, sizeof(md->name)); /* copy the new name into the name slot */ BLI_strncpy(md->name, value, sizeof(md->name)); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 2227304c7e3..82d0f0b3e6e 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -166,10 +166,10 @@ static void rna_Node_update_name(Main *bmain, Scene *scene, PointerRNA *ptr) { bNodeTree *ntree= (bNodeTree*)ptr->id.data; bNode *node= (bNode*)ptr->data; - char oldname[32]; + char oldname[sizeof(node->name)]; /* make a copy of the old name first */ - BLI_strncpy(oldname, node->name, sizeof(oldname)); + BLI_strncpy(oldname, node->name, sizeof(node->name)); nodeUniqueName(ntree, node); node->flag |= NODE_CUSTOM_NAME; diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 56f6792bdf1..238098e85e2 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -679,12 +679,12 @@ static void rna_def_pointcache(BlenderRNA *brna) prop= RNA_def_property(srna, "frame_start", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "startframe"); - RNA_def_property_range(prop, 1, 300000); + RNA_def_property_range(prop, 1, MAXFRAME); RNA_def_property_ui_text(prop, "Start", "Frame on which the simulation starts"); prop= RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "endframe"); - RNA_def_property_range(prop, 1, 300000); + RNA_def_property_range(prop, 1, MAXFRAME); RNA_def_property_ui_text(prop, "End", "Frame on which the simulation stops"); prop= RNA_def_property(srna, "step", PROP_INT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 39694b5b64a..0d31ec4776a 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -197,12 +197,12 @@ static void rna_PoseChannel_name_set(PointerRNA *ptr, const char *value) { Object *ob= (Object*)ptr->id.data; bPoseChannel *pchan= (bPoseChannel*)ptr->data; - char oldname[32], newname[32]; - + char oldname[sizeof(pchan->name)], newname[sizeof(pchan->name)]; + /* need to be on the stack */ - BLI_strncpy(newname, value, 32); - BLI_strncpy(oldname, pchan->name, 32); - + BLI_strncpy(newname, value, sizeof(pchan->name)); + BLI_strncpy(oldname, pchan->name, sizeof(pchan->name)); + ED_armature_bone_rename(ob->data, oldname, newname); } diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 950d9bc720c..be6bb1f00b8 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -236,7 +236,7 @@ static void rna_Sequence_name_set(PointerRNA *ptr, const char *value) { Scene *scene= (Scene*)ptr->id.data; Sequence *seq= (Sequence*)ptr->data; - char oldname[32]; + char oldname[sizeof(seq->name)]; /* make a copy of the old name first */ BLI_strncpy(oldname, seq->name+2, sizeof(seq->name)-2); |