Commit: ff3da11035fb625276c077357aec142e90525966
Author: Lukas Tönne
Date: Tue Mar 24 15:28:12 2015 +0100
Branches: alembic
https://developer.blender.org/rBff3da11035fb625276c077357aec142e90525966
Renamed the cache_dm to simply dm.
The fact that this is used for caching is only apparent on the higher
levels of the Object struct.
===================================================================
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/object_dupli.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/makesdna/DNA_object_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh.c
b/source/blender/blenkernel/intern/mesh.c
index e59e6fe..e6aa5df 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 8eaac7c..744a821 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2880,7 +2880,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 e94681d..20d330e 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 cf1a2bd..28648cd 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2158,10 +2158,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 cf7cea2..b24d361 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1044,10 +1044,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 058b5ea..4fdeebd 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -352,7 +352,7 @@ typedef struct DupliObjectData {
*/
struct Object *ob;
struct BoundBox bb;
- struct DerivedMesh *cache_dm;
+ struct DerivedMesh *dm;
} DupliObjectData;
typedef struct DupliCache {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
