[Bf-blender-cvs] [0e324b1] master: Cleanup in MBALL/displist: no need to create curvecache for non-basis mballs, will never be used anyway!
Bastien Montagne
noreply at git.blender.org
Fri Jul 18 18:12:43 CEST 2014
Commit: 0e324b19f913320a296a3bfbe1731af7fe76c6e9
Author: Bastien Montagne
Date: Fri Jul 18 18:08:56 2014 +0200
https://developer.blender.org/rB0e324b19f913320a296a3bfbe1731af7fe76c6e9
Cleanup in MBALL/displist: no need to create curvecache for non-basis mballs, will never be used anyway!
===================================================================
M source/blender/blenkernel/intern/displist.c
===================================================================
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index bfddf4f..d494115 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -715,21 +715,22 @@ void BKE_displist_make_mball(EvaluationContext *eval_ctx, Scene *scene, Object *
if (!ob || ob->type != OB_MBALL)
return;
- if (ob->curve_cache) {
- BKE_displist_free(&(ob->curve_cache->disp));
- }
- else {
- ob->curve_cache = MEM_callocN(sizeof(CurveCache), "CurveCache for MBall");
- }
-
if (ob == BKE_mball_basis_find(scene, ob)) {
+ if (ob->curve_cache) {
+ BKE_displist_free(&(ob->curve_cache->disp));
+ }
+ else {
+ ob->curve_cache = MEM_callocN(sizeof(CurveCache), "CurveCache for MBall");
+ }
+
BKE_mball_polygonize(eval_ctx, scene, ob, &ob->curve_cache->disp);
BKE_mball_texspace_calc(ob);
object_deform_mball(ob, &ob->curve_cache->disp);
- }
- boundbox_displist_object(ob);
+ /* NOP for MBALLs anyway... */
+ boundbox_displist_object(ob);
+ }
}
void BKE_displist_make_mball_forRender(EvaluationContext *eval_ctx, Scene *scene, Object *ob, ListBase *dispbase)
More information about the Bf-blender-cvs
mailing list