[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58150] branches/soc-2013-depsgraph_mt/ source/blender/blenkernel/intern/object.c: Get rid of confusing usage of cu->bb in BKE_object_minmax

Sergey Sharybin sergey.vfx at gmail.com
Wed Jul 10 13:36:48 CEST 2013


Revision: 58150
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58150
Author:   nazgul
Date:     2013-07-10 11:36:47 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Get rid of confusing usage of cu->bb in BKE_object_minmax

Curve-type objects now always does have object'level
bounding box, meaning cu->bb wouldn't evenr used in
BKE_object_minmax.

So zapping this confusing check for whether ob->bb
exists, which is always truth. Makes it easier to
follow what cu->bb is for and what ob->bb is for.

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c	2013-07-10 10:50:19 UTC (rev 58149)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c	2013-07-10 11:36:47 UTC (rev 58150)
@@ -2366,13 +2366,7 @@
 
 			/* Use the object bounding box so that modifier output
 			 * gets taken into account */
-			if (ob->bb)
-				bb = *(ob->bb);
-			else {
-				if (cu->bb == NULL)
-					BKE_curve_texspace_calc(cu);
-				bb = *(cu->bb);
-			}
+			bb = *(ob->bb);
 
 			for (a = 0; a < 8; a++) {
 				mul_m4_v3(ob->obmat, bb.vec[a]);




More information about the Bf-blender-cvs mailing list