[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46925] trunk/blender/source/blender/ modifiers/intern/MOD_solidify.c: solidify modifier - replace VECADDFAC with inline function.

Campbell Barton ideasman42 at gmail.com
Wed May 23 08:32:02 CEST 2012


Revision: 46925
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46925
Author:   campbellbarton
Date:     2012-05-23 06:32:02 +0000 (Wed, 23 May 2012)
Log Message:
-----------
solidify modifier - replace VECADDFAC with inline function.

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_solidify.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c	2012-05-23 06:25:31 UTC (rev 46924)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c	2012-05-23 06:32:02 UTC (rev 46925)
@@ -55,6 +55,14 @@
 	int f2;
 } EdgeFaceRef;
 
+/* spesific function for solidify - define locally */
+BLI_INLINE void madd_v3v3short_fl(float r[3], const short a[3], const float f)
+{
+	r[0] += (float)a[0] * f;
+	r[1] += (float)a[1] * f;
+	r[2] += (float)a[2] * f;
+}
+
 static void dm_calc_normal(DerivedMesh *dm, float (*temp_nors)[3])
 {
 	int i, numVerts, numEdges, numFaces;
@@ -422,7 +430,7 @@
 					scalar_short_vgroup = (offset_fac_vg + (scalar_short_vgroup * offset_fac_vg_inv)) * scalar_short;
 					dv++;
 				}
-				VECADDFAC(mv->co, mv->co, mv->no, scalar_short_vgroup);
+				madd_v3v3short_fl(mv->co, mv->no, scalar_short_vgroup);
 			}
 		}
 
@@ -437,7 +445,7 @@
 					scalar_short_vgroup = (offset_fac_vg + (scalar_short_vgroup * offset_fac_vg_inv)) * scalar_short;
 					dv++;
 				}
-				VECADDFAC(mv->co, mv->co, mv->no, scalar_short_vgroup);
+				madd_v3v3short_fl(mv->co, mv->no, scalar_short_vgroup);
 			}
 		}
 




More information about the Bf-blender-cvs mailing list