[Bf-blender-cvs] [b82cce0] master: Remove direct mball creation from the drawing code

Sergey Sharybin noreply at git.blender.org
Mon Jan 13 11:22:17 CET 2014


Commit: b82cce04d63a6c7421c9e29c321fe3c0f273204f
Author: Sergey Sharybin
Date:   Mon Jan 13 16:18:08 2014 +0600
https://developer.blender.org/rBb82cce04d63a6c7421c9e29c321fe3c0f273204f

Remove direct mball creation from the drawing code

This is the same case as curves, and really this is now
totally up to DAG, If something fails, poke me to fix the DAG.

===================================================================

M	source/blender/editors/space_view3d/drawobject.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 9a29693..52fdb6f 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -4055,11 +4055,7 @@ static bool drawDispList_nobackface(Scene *scene, View3D *v3d, RegionView3D *rv3
 		case OB_MBALL:
 
 			if (BKE_mball_is_basis(ob)) {
-				lb = ob->curve_cache ? &ob->curve_cache->disp : NULL;
-				if (ELEM(NULL, lb, lb->first)) {
-					BKE_displist_make_mball(G.main->eval_ctx, scene, ob);
-					lb = &ob->curve_cache->disp;
-				}
+				lb = &ob->curve_cache->disp;
 				if (lb->first == NULL) {
 					return true;
 				}
@@ -6268,10 +6264,6 @@ static void draw_bounding_volume(Scene *scene, Object *ob, char type)
 	else if (ob->type == OB_MBALL) {
 		if (BKE_mball_is_basis(ob)) {
 			bb = ob->bb;
-			if (bb == NULL) {
-				BKE_displist_make_mball(G.main->eval_ctx, scene, ob);
-				bb = ob->bb;
-			}
 		}
 	}
 	else if (ob->type == OB_ARMATURE) {




More information about the Bf-blender-cvs mailing list