archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Remove direct displist creation from object conversion

Browse Source 
If the object is visible and editable it means there's no
way DAG to fail to create needed display lists.
This commit is contained in:
Sergey Sharybin
2014-01-09 23:11:50 +06:00
parent b5592d86d6
commit 405cab9663
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/object/object_add.c
View File

@@ -1415,10 +1415,9 @@ static EnumPropertyItem convert_target_items[] = {
{0, NULL, 0, NULL, NULL}
};
static void curvetomesh(Scene *scene, Object *ob)
static void curvetomesh(Object *ob)
{
if (ELEM(NULL, ob->curve_cache, ob->curve_cache->disp.first))
BKE_displist_make_curveTypes(scene, ob, 0); /* force creation */
BLI_assert(ob->curve_cache != NULL);
BKE_mesh_from_nurbs(ob); /* also does users */
@@ -1630,7 +1629,7 @@ static int convert_exec(bContext *C, wmOperator *op)
BKE_curve_curve_dimension_update(cu);
if (target == OB_MESH) {
curvetomesh(scene, newob);
curvetomesh(newob);
/* meshes doesn't use displist */
BKE_object_free_curve_cache(newob);
@@ -1652,12 +1651,12 @@ static int convert_exec(bContext *C, wmOperator *op)
}
else {
newob = ob;
/* meshes doesn't use displist */
BKE_object_free_curve_cache(newob);
}
curvetomesh(scene, newob);
curvetomesh(newob);
/* meshes doesn't use displist */
BKE_object_free_curve_cache(newob);
}
}
else if (ob->type == OB_MBALL && target == OB_MESH) {