[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38888] trunk/blender/source/blender: fix, uvproject modifier wasn't copying the uv layer name,
Campbell Barton
ideasman42 at gmail.com
Mon Aug 1 07:25:31 CEST 2011
Revision: 38888
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38888
Author: campbellbarton
Date: 2011-08-01 05:25:30 +0000 (Mon, 01 Aug 2011)
Log Message:
-----------
fix, uvproject modifier wasn't copying the uv layer name,
also edit var names from recent commit to better fit with other functions.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2011-08-01 02:58:44 UTC (rev 38887)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2011-08-01 05:25:30 UTC (rev 38888)
@@ -580,19 +580,19 @@
/* ~~~~~~~~~~~~~~~~~~~~Non Uniform Rational B Spline calculations ~~~~~~~~~~~ */
-static void calcknots(float *knots, const short tot, const short order, const short flag)
+static void calcknots(float *knots, const short pnts, const short order, const short flag)
{
/* knots: number of pnts NOT corrected for cyclic */
- const int tot_order= tot + order;
+ const int pnts_order= pnts + order;
float k;
int a;
switch(flag & (CU_NURB_ENDPOINT|CU_NURB_BEZIER)) {
case CU_NURB_ENDPOINT:
k= 0.0;
- for(a=1; a <= tot_order; a++) {
+ for(a=1; a <= pnts_order; a++) {
knots[a-1]= k;
- if(a >= order && a <= tot) k+= 1.0f;
+ if(a >= order && a <= pnts) k+= 1.0f;
}
break;
case CU_NURB_BEZIER:
@@ -600,15 +600,15 @@
* if this is not enforced, the displist will be corrupt */
if(order==4) {
k= 0.34;
- for(a=0; a < tot_order; a++) {
+ for(a=0; a < pnts_order; a++) {
knots[a]= floorf(k);
k+= (1.0f/3.0f);
}
}
else if(order==3) {
k= 0.6f;
- for(a=0; a < tot_order; a++) {
- if(a >= order && a <= tot) k+= 0.5f;
+ for(a=0; a < pnts_order; a++) {
+ if(a >= order && a <= pnts) k+= 0.5f;
knots[a]= floorf(k);
}
}
@@ -617,7 +617,7 @@
}
break;
default:
- for(a=0; a < tot_order; a++) {
+ for(a=0; a < pnts_order; a++) {
knots[a]= (float)a;
}
break;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c 2011-08-01 02:58:44 UTC (rev 38887)
+++ trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c 2011-08-01 05:25:30 UTC (rev 38888)
@@ -42,6 +42,7 @@
#include "DNA_object_types.h"
#include "BLI_math.h"
+#include "BLI_string.h"
#include "BLI_uvproject.h"
#include "BLI_utildefines.h"
@@ -83,6 +84,7 @@
tumd->aspecty = umd->aspecty;
tumd->scalex = umd->scalex;
tumd->scaley = umd->scaley;
+ BLI_strncpy(tumd->uvlayer_name, umd->uvlayer_name, sizeof(umd->uvlayer_name));
}
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md))
More information about the Bf-blender-cvs
mailing list