sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix, uvproject modifier wasn't copying the uv layer name,

Browse Source 
also edit var names from recent commit to better fit with other functions.
This commit is contained in:
Campbell Barton 2011-08-01 05:25:30 +00:00
parent 9da712a581
commit af39f26360
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/curve.c
View File

@ -580,19 +580,19 @@ void addNurbPointsBezier(Nurb *nu, int number)
/* ~~~~~~~~~~~~~~~~~~~~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 @@ static void calcknots(float *knots, const short tot, const short order, const sh
* 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 @@ static void calcknots(float *knots, const short tot, const short order, const sh
}
break;
default:
for(a=0; a < tot_order; a++) {
for(a=0; a < pnts_order; a++) {
knots[a]= (float)a;
}
break;

2
source/blender/modifiers/intern/MOD_uvproject.c
View File

@ -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 @@ static void copyData(ModifierData *md, ModifierData *target)
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))