Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesrna/intern/rna_modifier.c')
-rw-r--r--source/blender/makesrna/intern/rna_modifier.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 24a020b156c..429fae2fab0 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -687,7 +687,7 @@ static void rna_UVProject_projectors_begin(CollectionPropertyIterator *iter, Poi
{
UVProjectModifierData *uvp = (UVProjectModifierData *)ptr->data;
rna_iterator_array_begin(
- iter, (void *)uvp->projectors, sizeof(Object *), uvp->num_projectors, 0, NULL);
+ iter, (void *)uvp->projectors, sizeof(Object *), uvp->projectors_num, 0, NULL);
}
static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr)
@@ -949,15 +949,15 @@ static int rna_HookModifier_vertex_indices_get_length(PointerRNA *ptr,
int length[RNA_MAX_ARRAY_DIMENSION])
{
HookModifierData *hmd = ptr->data;
- int totindex = hmd->indexar ? hmd->totindex : 0;
- return (length[0] = totindex);
+ int indexar_num = hmd->indexar ? hmd->indexar_num : 0;
+ return (length[0] = indexar_num);
}
static void rna_HookModifier_vertex_indices_get(PointerRNA *ptr, int *values)
{
HookModifierData *hmd = ptr->data;
if (hmd->indexar != NULL) {
- memcpy(values, hmd->indexar, sizeof(int) * hmd->totindex);
+ memcpy(values, hmd->indexar, sizeof(int) * hmd->indexar_num);
}
}
@@ -968,7 +968,7 @@ static void rna_HookModifier_vertex_indices_set(HookModifierData *hmd,
{
if (indices_len == 0) {
MEM_SAFE_FREE(hmd->indexar);
- hmd->totindex = 0;
+ hmd->indexar_num = 0;
}
else {
/* Reject negative indices. */
@@ -998,7 +998,7 @@ static void rna_HookModifier_vertex_indices_set(HookModifierData *hmd,
/* Success - save the new array. */
MEM_SAFE_FREE(hmd->indexar);
hmd->indexar = buffer;
- hmd->totindex = indices_len;
+ hmd->indexar_num = indices_len;
}
}
@@ -1148,8 +1148,8 @@ static void rna_UVProjectModifier_num_projectors_set(PointerRNA *ptr, int value)
UVProjectModifierData *md = (UVProjectModifierData *)ptr->data;
int a;
- md->num_projectors = CLAMPIS(value, 1, MOD_UVPROJECT_MAXPROJECTORS);
- for (a = md->num_projectors; a < MOD_UVPROJECT_MAXPROJECTORS; a++) {
+ md->projectors_num = CLAMPIS(value, 1, MOD_UVPROJECT_MAXPROJECTORS);
+ for (a = md->projectors_num; a < MOD_UVPROJECT_MAXPROJECTORS; a++) {
md->projectors[a] = NULL;
}
}
@@ -3104,7 +3104,7 @@ static void rna_def_modifier_uvproject(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "projector_count", PROP_INT, PROP_NONE);
- RNA_def_property_int_sdna(prop, NULL, "num_projectors");
+ RNA_def_property_int_sdna(prop, NULL, "projectors_num");
RNA_def_property_ui_text(prop, "Number of Projectors", "Number of projectors to use");
RNA_def_property_int_funcs(prop, NULL, "rna_UVProjectModifier_num_projectors_set", NULL);
RNA_def_property_range(prop, 1, MOD_UVPROJECT_MAXPROJECTORS);