Commit: 1b9b5b65fc50bb0112a57e1b9b889de45b403b35 Author: Bastien Montagne Date: Wed Feb 4 16:09:57 2015 +0100 Branches: temp_custom_loop_normals https://developer.blender.org/rB1b9b5b65fc50bb0112a57e1b9b889de45b403b35
Revert A -> a change in comment about spheroid equation (not in code though), and remove CD_MASK_NORMAL from CD_MASK_MESH (not needed!). =================================================================== M source/blender/blenkernel/intern/customdata.c M source/blender/modifiers/intern/MOD_normal_edit.c =================================================================== diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index c35e44d..0436ec0 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1324,7 +1324,7 @@ static const char *LAYERTYPENAMES[CD_NUMTYPES] = { const CustomDataMask CD_MASK_BAREMESH = CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE | CD_MASK_MLOOP | CD_MASK_MPOLY | CD_MASK_BWEIGHT; const CustomDataMask CD_MASK_MESH = - CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE | CD_MASK_NORMAL | + CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE | CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MPOLY | CD_MASK_MLOOP | diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index eb30358..9c8849d 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -164,13 +164,13 @@ static void normalEditModifier_do_radial( generate_vert_coordinates(dm, ob, smd->target, smd->offset, num_verts, cos, size); - /* size gives us our spheroid coefficients (a, b, c). - * Then, we want to find out for each vert its (a, b, c) triple (proportional to (a, b, c) one). + /* size gives us our spheroid coefficients (A, B, C). + * Then, we want to find out for each vert its (a, b, c) triple (proportional to (A, B, C) one). * * Ellipsoid basic equation: (x^2/a^2) + (y^2/b^2) + (z^2/c^2) = 1. - * Since we want to find (a, b, c) matching this equation and proportional to (a, b, c), we can do: - * m = b / a - * n = c / a + * Since we want to find (a, b, c) matching this equation and proportional to (A, B, C), we can do: + * m = B / A + * n = C / A * hence: * (x^2/a^2) + (y^2/b^2) + (z^2/c^2) = 1 * -> b^2*c^2*x^2 + a^2*c^2*y^2 + a^2*b^2*z^2 = a^2*b^2*c^2 _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs