[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56543] trunk/blender/source/blender/ blenkernel/intern/mesh.c: code cleanup: BKE_mesh_nurbs_displist_to_mdata(), use const bool for

Campbell Barton ideasman42 at gmail.com
Wed May 8 14:53:52 CEST 2013


Revision: 56543
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56543
Author:   campbellbarton
Date:     2013-05-08 12:53:52 +0000 (Wed, 08 May 2013)
Log Message:
-----------
code cleanup: BKE_mesh_nurbs_displist_to_mdata(), use const bool for
'conv_polys'

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c	2013-05-08 12:53:43 UTC (rev 56542)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c	2013-05-08 12:53:52 UTC (rev 56543)
@@ -1301,8 +1301,8 @@
                                      MLoopUV **alluv,
                                      int *_totloop, int *_totpoly)
 {
+	Curve *cu = ob->data;
 	DispList *dl;
-	Curve *cu;
 	MVert *mvert;
 	MPoly *mpoly;
 	MLoop *mloop;
@@ -1311,14 +1311,9 @@
 	float *data;
 	int a, b, ofs, vertcount, startvert, totvert = 0, totedge = 0, totloop = 0, totvlak = 0;
 	int p1, p2, p3, p4, *index;
-	int conv_polys = 0;
+	const bool conv_polys = ((cu->flag & CU_3D) ||    /* 2d polys are filled with DL_INDEX3 displists */
+	                         (ob->type == OB_SURF));  /* surf polys are never filled */
 
-	cu = ob->data;
-
-
-	conv_polys |= cu->flag & CU_3D;      /* 2d polys are filled with DL_INDEX3 displists */
-	conv_polys |= ob->type == OB_SURF;   /* surf polys are never filled */
-
 	/* count */
 	dl = dispbase->first;
 	while (dl) {




More information about the Bf-blender-cvs mailing list