Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix broken Cycles curve motion radius after recent refactor, and fix warnings.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-05-30 22:44:17 +02:00
parent 1482826075
commit 0d4a7d50c6
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/subd/subd_dice.cpp
View File

@@ -41,7 +41,7 @@ EdgeDice::EdgeDice(const SubdParams& params_)
}
}
void EdgeDice::reserve(int num_verts, int num_tris)
void EdgeDice::reserve(int num_verts)
{
Mesh *mesh = params.mesh;
@@ -147,8 +147,7 @@ void QuadDice::reserve(EdgeFactors& ef, int Mu, int Mv)
{
/* XXX need to make this also work for edge factor 0 and 1 */
int num_verts = (ef.tu0 + ef.tu1 + ef.tv0 + ef.tv1) + (Mu - 1)*(Mv - 1);
int num_tris = 0;
EdgeDice::reserve(num_verts, num_tris);
EdgeDice::reserve(num_verts);
}
float2 QuadDice::map_uv(SubPatch& sub, float u, float v)
@@ -358,7 +357,7 @@ void TriangleDice::reserve(EdgeFactors& ef, int M)
if(!(M & 1))
num_verts++;
EdgeDice::reserve(num_verts, 0);
EdgeDice::reserve(num_verts);
}
float2 TriangleDice::map_uv(SubPatch& sub, float2 uv)

2
intern/cycles/subd/subd_dice.h
View File

@@ -72,7 +72,7 @@ public:
explicit EdgeDice(const SubdParams& params);
void reserve(int num_verts, int num_tris);
void reserve(int num_verts);
int add_vert(Patch *patch, float2 uv);
void add_triangle(Patch *patch, int v0, int v1, int v2);