diff options
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 12 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 65a092fe6a4..03d24d525a1 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2486,7 +2486,7 @@ Mesh *BKE_mesh_new_from_dupli_data( bool calc_tessface, bool calc_undeformed) { Object *ob = data->ob; - DerivedMesh *dm = data->cache_dm; + DerivedMesh *dm = data->dm; CustomDataMask mask; Mesh *tmpmesh; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 007ee306ecb..49f7eb86890 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2874,7 +2874,7 @@ bool BKE_object_minmax_dupli(Scene *scene, Object *ob, float r_min[3], float r_m BoundBox *bb = NULL; if (ob->dup_cache) { DupliObjectData *dob_data = BKE_dupli_cache_find_data(ob->dup_cache, dob->ob); - if (dob_data->cache_dm) { + if (dob_data->dm) { bb = &dob_data->bb; } } diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index e94681d16a8..20d330ef64a 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -1326,9 +1326,9 @@ static void dupli_cache_calc_boundbox(DupliObjectData *data) { float min[3], max[3]; - if (data->cache_dm) { + if (data->dm) { INIT_MINMAX(min, max); - data->cache_dm->getMinMax(data->cache_dm, min, max); + data->dm->getMinMax(data->dm, min, max); } else { zero_v3(min); @@ -1342,7 +1342,7 @@ void BKE_dupli_object_data_init(DupliObjectData *data, Object *ob, DerivedMesh * { data->ob = ob; - data->cache_dm = dm; + data->dm = dm; dm->needsFree = false; /* take ownership */ memset(&data->bb, 0, sizeof(data->bb)); @@ -1351,11 +1351,11 @@ void BKE_dupli_object_data_init(DupliObjectData *data, Object *ob, DerivedMesh * void BKE_dupli_object_data_clear(DupliObjectData *data) { - if (data->cache_dm) { + if (data->dm) { /* we lock DMs in the cache to prevent freeing outside, * now allow releasing again */ - data->cache_dm->needsFree = true; + data->dm->needsFree = true; data->cache_dm->release(data->cache_dm); } @@ -1499,7 +1499,7 @@ DupliObjectData *BKE_dupli_cache_find_data(DupliCache *dupcache, Object *ob) DupliObjectData *BKE_dupli_cache_add_mesh(DupliCache *dupcache, Object *ob, DerivedMesh *dm) { DupliObjectData *data = dupli_cache_add_object_data(dupcache, ob); - data->cache_dm = dm; + data->dm = dm; dupli_cache_calc_boundbox(data); /* we own this dm now and need to protect it until we free it ourselves */ diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 03486f42623..6e608db2a90 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2104,10 +2104,10 @@ static void draw_dupli_objects_color( tbase.object->transflag &= ~OB_IS_DUPLI_CACHE; if (base->object->dup_cache) { DupliObjectData *dob_data = BKE_dupli_cache_find_data(base->object->dup_cache, tbase.object); - if (dob_data->cache_dm) { + if (dob_data->dm) { tbase.object->transflag |= OB_IS_DUPLI_CACHE; - tbase.object->derivedFinal = dob_data->cache_dm; + tbase.object->derivedFinal = dob_data->dm; bb_tmp = &dob_data->bb; } } diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 57a7c513abb..64420902799 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1048,10 +1048,10 @@ static void view3d_select_loop(ViewContext *vc, Scene *scene, View3D *v3d, ARegi tbase.object->transflag &= ~OB_IS_DUPLI_CACHE; if (base->object->dup_cache) { DupliObjectData *dob_data = BKE_dupli_cache_find_data(base->object->dup_cache, tbase.object); - if (dob_data->cache_dm) { + if (dob_data->dm) { tbase.object->transflag |= OB_IS_DUPLI_CACHE; - tbase.object->derivedFinal = dob_data->cache_dm; + tbase.object->derivedFinal = dob_data->dm; } } diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index dfbc08ae675..5b81d379943 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -342,7 +342,7 @@ typedef struct DupliObjectData { */ struct Object *ob; struct BoundBox bb; - struct DerivedMesh *cache_dm; + struct DerivedMesh *dm; } DupliObjectData; typedef struct DupliCache { |