[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59796] trunk/blender/source/blender/ blenkernel: fix for building on msvc

Campbell Barton ideasman42 at gmail.com
Wed Sep 4 08:50:15 CEST 2013


Revision: 59796
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59796
Author:   campbellbarton
Date:     2013-09-04 06:50:15 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
fix for building on msvc

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_mesh.h
    trunk/blender/source/blender/blenkernel/intern/mesh_validate.c

Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h	2013-09-04 05:25:29 UTC (rev 59795)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h	2013-09-04 06:50:15 UTC (rev 59796)
@@ -355,7 +355,7 @@
 bool BKE_mesh_validate_all_customdata(
         struct CustomData *vdata, struct CustomData *edata,
         struct CustomData *ldata, struct CustomData *pdata,
-        uint64_t mask,  /* should be CustomDataMask but thats not defined */
+        const bool check_meshmask,
         const bool do_verbose, const bool do_fixes,
         bool *r_change);
 

Modified: trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh_validate.c	2013-09-04 05:25:29 UTC (rev 59795)
+++ trunk/blender/source/blender/blenkernel/intern/mesh_validate.c	2013-09-04 06:50:15 UTC (rev 59796)
@@ -903,12 +903,13 @@
  */
 bool BKE_mesh_validate_all_customdata(CustomData *vdata, CustomData *edata,
                                       CustomData *ldata, CustomData *pdata,
-                                      CustomDataMask mask,
+                                      const bool check_meshmask,
                                       const bool do_verbose, const bool do_fixes,
                                       bool *r_change)
 {
 	bool is_valid = true;
 	bool is_change_v, is_change_e, is_change_l, is_change_p;
+	CustomDataMask mask = check_meshmask ? CD_MASK_MESH : 0;
 
 	is_valid &= mesh_validate_customdata(vdata, mask, do_verbose, do_fixes, &is_change_v);
 	is_valid &= mesh_validate_customdata(edata, mask, do_verbose, do_fixes, &is_change_e);
@@ -936,7 +937,7 @@
 
 	is_valid &= BKE_mesh_validate_all_customdata(
 	        &me->vdata, &me->edata, &me->ldata, &me->pdata,
-	        CD_MASK_MESH,
+	        true,
 	        do_verbose, true,
 	        &is_change);
 




More information about the Bf-blender-cvs mailing list