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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-05-07 10:58:03 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-05-07 10:58:03 +0400
commit3ef11693f56429239771f8c043bf2fe2838a5fc7 (patch)
treecd7ca92447aa18c3a8ae328489463887246262b2 /source/blender/editors/object
parentc7b20e79cdd055cb9f42d39764f868f0c48e60a2 (diff)
Style cleanup: displist module
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_add.c10
-rw-r--r--source/blender/editors/object/object_modifier.c4
-rw-r--r--source/blender/editors/object/object_relations.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 5a2370eb518..466338a736f 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1239,7 +1239,7 @@ static EnumPropertyItem convert_target_items[] = {
static void curvetomesh(Scene *scene, Object *ob)
{
if (ob->disp.first == NULL)
- makeDispListCurveTypes(scene, ob, 0); /* force creation */
+ BKE_displist_make_curveTypes(scene, ob, 0); /* force creation */
BKE_mesh_from_nurbs(ob); /* also does users */
@@ -1405,7 +1405,7 @@ static int convert_exec(bContext *C, wmOperator *op)
cu = newob->data;
if (!newob->disp.first)
- makeDispListCurveTypes(scene, newob, 0);
+ BKE_displist_make_curveTypes(scene, newob, 0);
newob->type = OB_CURVE;
cu->type = OB_CURVE;
@@ -1446,7 +1446,7 @@ static int convert_exec(bContext *C, wmOperator *op)
curvetomesh(scene, newob);
/* meshes doesn't use displist */
- freedisplist(&newob->disp);
+ BKE_displist_free(&newob->disp);
}
}
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
@@ -1467,7 +1467,7 @@ static int convert_exec(bContext *C, wmOperator *op)
newob = ob;
/* meshes doesn't use displist */
- freedisplist(&newob->disp);
+ BKE_displist_free(&newob->disp);
}
curvetomesh(scene, newob);
@@ -1487,7 +1487,7 @@ static int convert_exec(bContext *C, wmOperator *op)
}
if (!baseob->disp.first) {
- makeDispListMBall(scene, baseob);
+ BKE_displist_make_mball(scene, baseob);
}
if (!(baseob->flag & OB_DONE)) {
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index f6bf9ba2f15..17f4ea73d6d 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1372,10 +1372,10 @@ static int meshdeform_bind_exec(bContext *C, wmOperator *op)
BKE_lattice_modifiers_calc(scene, ob);
}
else if (ob->type == OB_MBALL) {
- makeDispListMBall(scene, ob);
+ BKE_displist_make_mball(scene, ob);
}
else if (ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
- makeDispListCurveTypes(scene, ob, 0);
+ BKE_displist_make_curveTypes(scene, ob, 0);
}
mmd->bindfunc = NULL;
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 9d4f6326278..b3e16c8d4eb 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -533,7 +533,7 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
if ((cu->flag & CU_PATH) == 0) {
cu->flag |= CU_PATH | CU_FOLLOW;
- makeDispListCurveTypes(scene, par, 0); /* force creation of path data */
+ BKE_displist_make_curveTypes(scene, par, 0); /* force creation of path data */
}
else cu->flag |= CU_FOLLOW;