Commit: b5592d86d6368b64bf33eed251cb6c389054d1d2
Author: Sergey Sharybin
Date: Thu Jan 9 23:02:45 2014 +0600
https://developer.blender.org/rBb5592d86d6368b64bf33eed251cb6c389054d1d2
Remove direct displist creation from bevel code
BKE_curve_bevel_make() is only used from object_handle_update()
friends and never called directly. This means if there's no
display list ready for the bevel object it's something wrong
happened with DAG.
In fact, this check goes back to ancient era and from tests
it appears this check is no longer needed.
===================================================================
M source/blender/blenkernel/intern/curve.c
===================================================================
diff --git a/source/blender/blenkernel/intern/curve.c
b/source/blender/blenkernel/intern/curve.c
index 4898832..efb9788 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1649,11 +1649,8 @@ void BKE_curve_bevel_make(Scene *scene, Object *ob,
ListBase *disp, int forRende
dl = bevdisp.first;
}
else {
- dl = cu->bevobj->curve_cache ?
cu->bevobj->curve_cache->disp.first : NULL;
- if (dl == NULL) {
- BKE_displist_make_curveTypes(scene,
cu->bevobj, 0);
- dl =
cu->bevobj->curve_cache->disp.first;
- }
+ BLI_assert(cu->bevobj->curve_cache != NULL);
+ dl = cu->bevobj->curve_cache->disp.first;
}
while (dl) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
