[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59259] branches/soc-2013-depsgraph_mt/ source/blender: Use BOUNDBOX_DIRTY to mark BB as need to be updated

[Sergey Sharybin]

Revision: 59259
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59259
Author:   nazgul
Date:     2013-08-19 08:03:40 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
Use BOUNDBOX_DIRTY to mark BB as need to be updated

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
    branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_object_types.h
    branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh.c

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c	2013-08-19 07:43:26 UTC (rev 59258)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c	2013-08-19 08:03:40 UTC (rev 59259)
@@ -391,7 +391,7 @@
 
 	BKE_boundbox_init_from_minmax(bb, min, max);
 
-	bb->flag &= ~BOUNDBOX_INVALID;
+	bb->flag &= ~BOUNDBOX_DIRTY;
 }
 
 BoundBox *BKE_curve_boundbox_get(Object *ob)
@@ -401,7 +401,7 @@
 	if (ob->bb)
 		return ob->bb;
 
-	if (cu->bb == NULL || (cu->bb->flag & BOUNDBOX_INVALID)) {
+	if (cu->bb == NULL || (cu->bb->flag & BOUNDBOX_DIRTY)) {
 		BKE_curve_texspace_calc(cu);
 	}
 
@@ -430,7 +430,7 @@
 
 void BKE_curve_texspace_get(Curve *cu, float r_loc[3], float r_rot[3], float r_size[3])
 {
-	if (cu->bb == NULL || (cu->bb->flag & BOUNDBOX_INVALID)) {
+	if (cu->bb == NULL || (cu->bb->flag & BOUNDBOX_DIRTY)) {
 		BKE_curve_texspace_calc(cu);
 	}
 

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c	2013-08-19 07:43:26 UTC (rev 59258)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c	2013-08-19 08:03:40 UTC (rev 59259)
@@ -658,7 +658,7 @@
 	
 	BKE_boundbox_init_from_minmax(bb, min, max);
 
-	bb->flag &= ~BOUNDBOX_INVALID;
+	bb->flag &= ~BOUNDBOX_DIRTY;
 }
 
 void BKE_mesh_texspace_calc(Mesh *me)
@@ -688,7 +688,7 @@
 	if (ob->bb)
 		return ob->bb;
 
-	if (me->bb == NULL || (me->bb->flag & BOUNDBOX_INVALID)) {
+	if (me->bb == NULL || (me->bb->flag & BOUNDBOX_DIRTY)) {
 		BKE_mesh_texspace_calc(me);
 	}
 
@@ -697,7 +697,7 @@
 
 void BKE_mesh_texspace_get(Mesh *me, float r_loc[3], float r_rot[3], float r_size[3])
 {
-	if (me->bb == NULL || (me->bb->flag & BOUNDBOX_INVALID)) {
+	if (me->bb == NULL || (me->bb->flag & BOUNDBOX_DIRTY)) {
 		BKE_mesh_texspace_calc(me);
 	}
 

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c	2013-08-19 07:43:26 UTC (rev 59258)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c	2013-08-19 08:03:40 UTC (rev 59259)
@@ -259,14 +259,14 @@
 		Mesh *me = ob->data;
 
 		if (me->bb) {
-			me->bb->flag |= BOUNDBOX_INVALID;
+			me->bb->flag |= BOUNDBOX_DIRTY;
 		}
 	}
 	else if (ELEM3(ob->type, OB_SURF, OB_CURVE, OB_FONT)) {
 		Curve *cu = ob->data;
 
 		if (cu->bb) {
-			cu->bb->flag |= BOUNDBOX_INVALID;
+			cu->bb->flag |= BOUNDBOX_DIRTY;
 		}
 	}
 

Modified: branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_object_types.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_object_types.h	2013-08-19 07:43:26 UTC (rev 59258)
+++ branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_object_types.h	2013-08-19 08:03:40 UTC (rev 59259)
@@ -102,7 +102,7 @@
 /* boundbox flag */
 enum {
 	BOUNDBOX_DISABLED = (1 << 0),
-	BOUNDBOX_INVALID  = (1 << 1),
+	BOUNDBOX_DIRTY  = (1 << 1),
 };
 
 typedef struct Object {

Modified: branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh.c	2013-08-19 07:43:26 UTC (rev 59258)
+++ branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh.c	2013-08-19 08:03:40 UTC (rev 59259)
@@ -575,7 +575,7 @@
 {
 	Mesh *me = (Mesh *)ptr->data;
 
-	if (me->bb == NULL || (me->bb->flag & BOUNDBOX_INVALID)) {
+	if (me->bb == NULL || (me->bb->flag & BOUNDBOX_DIRTY)) {
 		BKE_mesh_texspace_calc(me);
 	}
 
@@ -586,7 +586,7 @@
 {
 	Mesh *me = (Mesh *)ptr->data;
 
-	if (me->bb == NULL || (me->bb->flag & BOUNDBOX_INVALID)) {
+	if (me->bb == NULL || (me->bb->flag & BOUNDBOX_DIRTY)) {
 		BKE_mesh_texspace_calc(me);
 	}