diff options
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_transform.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_collection_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/dna_rename_defs.h | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_collection.c | 1 |
7 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 06b6fb38a2a..65883d48bf7 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1579,7 +1579,7 @@ void BKE_object_make_proxy(Main *bmain, Object *ob, Object *target, Object *cob) mul_m4_m4m4(ob->obmat, cob->obmat, target->obmat); if (cob->instance_collection) { /* should always be true */ float tvec[3]; - mul_v3_mat3_m4v3(tvec, ob->obmat, cob->instance_collection->dupli_ofs); + mul_v3_mat3_m4v3(tvec, ob->obmat, cob->instance_collection->instance_offset); sub_v3_v3(ob->obmat[3], tvec); } BKE_object_apply_mat4(ob, ob->obmat, false, true); diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index dbdde4cd39a..db4714a2543 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -276,7 +276,7 @@ static void make_duplis_collection(const DupliContext *ctx) /* combine collection offset and obmat */ unit_m4(collection_mat); - sub_v3_v3(collection_mat[3], collection->dupli_ofs); + sub_v3_v3(collection_mat[3], collection->instance_offset); mul_m4_m4m4(collection_mat, ob->obmat, collection_mat); /* don't access 'ob->obmat' from now on. */ @@ -943,8 +943,8 @@ static void make_duplis_particle_system(const DupliContext *ctx, ParticleSystem mul_v3_fl(tmat[3], size * scale); /* collection dupli offset, should apply after everything else */ - if (!is_zero_v3(part->instance_collection->dupli_ofs)) { - sub_v3_v3(tmat[3], part->instance_collection->dupli_ofs); + if (!is_zero_v3(part->instance_collection->instance_offset)) { + sub_v3_v3(tmat[3], part->instance_collection->instance_offset); } /* individual particle transform */ diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index cb8bb47a577..0ecb088e57e 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -308,7 +308,7 @@ bool BKE_object_eval_proxy_copy(Depsgraph *depsgraph, mul_m4_m4m4(object->obmat, imat, object->proxy_from->obmat); /* Should always be true. */ if (obg->instance_collection) { - add_v3_v3(object->obmat[3], obg->instance_collection->dupli_ofs); + add_v3_v3(object->obmat[3], obg->instance_collection->instance_offset); } } else { diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index c35df60a82a..31c9a428f3c 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -944,7 +944,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) mul_m4_v3(ob->imat, cent); } - add_v3_v3(ob->instance_collection->dupli_ofs, cent); + add_v3_v3(ob->instance_collection->instance_offset, cent); tot_change++; ob->instance_collection->id.tag |= LIB_TAG_DOIT; diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h index 111e013bfe1..7b47523baa7 100644 --- a/source/blender/makesdna/DNA_collection_types.h +++ b/source/blender/makesdna/DNA_collection_types.h @@ -56,7 +56,7 @@ typedef struct Collection { struct PreviewImage *preview; unsigned int layer DNA_DEPRECATED; - float dupli_ofs[3]; + float instance_offset[3]; short flag, pad[3]; diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 93ce7f748c5..f295657ddb6 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -44,7 +44,7 @@ * Compare the results before & after to ensure all changes are reversed by renaming * and the DNA remains unchanged. * - * \see versioning_dna.c for a actual version patching. + * \see versioning_dna.c for actual version patching. */ /* No include guard (intentional). */ @@ -57,6 +57,7 @@ DNA_STRUCT_RENAME(SpaceOops, SpaceOutliner) DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_distance) DNA_STRUCT_RENAME_ELEM(Camera, clipend, clip_end) DNA_STRUCT_RENAME_ELEM(Camera, clipsta, clip_start) +DNA_STRUCT_RENAME_ELEM(Collection, dupli_ofs, instance_offset) DNA_STRUCT_RENAME_ELEM(Object, dup_group, instance_collection) DNA_STRUCT_RENAME_ELEM(Object, dupfacesca, instance_faces_scale) DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_group, instance_collection) diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c index 115b6a9d3e9..0e698a966f4 100644 --- a/source/blender/makesrna/intern/rna_collection.c +++ b/source/blender/makesrna/intern/rna_collection.c @@ -309,7 +309,6 @@ void RNA_def_collections(BlenderRNA *brna) RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT); prop = RNA_def_property(srna, "instance_offset", PROP_FLOAT, PROP_TRANSLATION); - RNA_def_property_float_sdna(prop, NULL, "dupli_ofs"); RNA_def_property_ui_text(prop, "Instance Offset", "Offset from the origin to use when instancing"); RNA_def_property_ui_range(prop, -10000.0, 10000.0, 10, RNA_TRANSLATION_PREC_DEFAULT); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); |