Revision: 42606 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42606 Author: mont29 Date: 2011-12-13 16:36:13 +0000 (Tue, 13 Dec 2011) Log Message: ----------- Merged 39990:42605 from trunk (arf!)
Modified Paths: -------------- branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_armature.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_bevel.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean_util.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean_util.h branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_build.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cast.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cloth.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_collision.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_curve.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_decimate.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_displace.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_edgesplit.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_explode.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim_util.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim_util.h branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_hook.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_lattice.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mask.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshdeform.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mirror.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_multires.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_none.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_particleinstance.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_particlesystem.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_screw.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shapekey.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shrinkwrap.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_simpledeform.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smoke.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smooth.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_softbody.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_solidify.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_subsurf.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_surface.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.h branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_uvproject.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_warp.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_wave.c Added Paths: ----------- branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_dynamicpaint.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_ocean.c Property Changed: ---------------- branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_armature.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_bevel.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean_util.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_boolean_util.h branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_build.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cast.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_cloth.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_collision.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_curve.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_decimate.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_displace.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_edgesplit.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_explode.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim_util.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_fluidsim_util.h branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_hook.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_lattice.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mask.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshdeform.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mirror.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_multires.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_none.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_particleinstance.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_particlesystem.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_screw.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shapekey.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_shrinkwrap.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_simpledeform.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smoke.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_smooth.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_softbody.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_solidify.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_subsurf.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_surface.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.h branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_uvproject.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_warp.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_wave.c Modified: branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_armature.c =================================================================== --- branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_armature.c 2011-12-13 13:03:28 UTC (rev 42605) +++ branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_armature.c 2011-12-13 16:36:13 UTC (rev 42606) @@ -1,34 +1,32 @@ /* -* $Id$ -* -* ***** BEGIN GPL LICENSE BLOCK ***** -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software Foundation, -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -* -* The Original Code is Copyright (C) 2005 by the Blender Foundation. -* All rights reserved. -* -* Contributor(s): Daniel Dunbar -* Ton Roosendaal, -* Ben Batt, -* Brecht Van Lommel, -* Campbell Barton -* -* ***** END GPL LICENSE BLOCK ***** -* -*/ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2005 by the Blender Foundation. + * All rights reserved. + * + * Contributor(s): Daniel Dunbar + * Ton Roosendaal, + * Ben Batt, + * Brecht Van Lommel, + * Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + * + */ /** \file blender/modifiers/intern/MOD_armature.c * \ingroup modifiers @@ -42,6 +40,7 @@ #include "DNA_mesh_types.h" #include "BLI_utildefines.h" +#include "BLI_string.h" #include "BKE_cdderivedmesh.h" @@ -70,7 +69,7 @@ tamd->object = amd->object; tamd->deformflag = amd->deformflag; tamd->multi = amd->multi; - strncpy(tamd->defgrp_name, amd->defgrp_name, 32); + BLI_strncpy(tamd->defgrp_name, amd->defgrp_name, 32); } static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md)) @@ -111,7 +110,7 @@ DagNode *curNode = dag_get_node(forest, amd->object); dag_add_relation(forest, curNode, obNode, - DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Armature Modifier"); + DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Armature Modifier"); } } @@ -170,7 +169,7 @@ if(!derivedData) dm = CDDM_from_editmesh(editData, ob->data); armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, - amd->deformflag, NULL, amd->defgrp_name); + amd->deformflag, NULL, amd->defgrp_name); if(!derivedData) dm->release(dm); } @@ -184,7 +183,7 @@ if(!derivedData) dm = CDDM_from_mesh((Mesh*)ob->data, ob); armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, - amd->deformflag, NULL, amd->defgrp_name); + amd->deformflag, NULL, amd->defgrp_name); if(!derivedData) dm->release(dm); } Property changes on: branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_armature.c ___________________________________________________________________ Deleted: svn:keywords - Author Date Id Revision Modified: branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c =================================================================== --- branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c 2011-12-13 13:03:28 UTC (rev 42605) +++ branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c 2011-12-13 16:36:13 UTC (rev 42606) @@ -1,34 +1,32 @@ /* -* $Id$ -* -* ***** BEGIN GPL LICENSE BLOCK ***** -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software Foundation, -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -* -* The Original Code is Copyright (C) 2005 by the Blender Foundation. -* All rights reserved. -* -* Contributor(s): Daniel Dunbar -* Ton Roosendaal, -* Ben Batt, -* Brecht Van Lommel, -* Campbell Barton -* -* ***** END GPL LICENSE BLOCK ***** -* -*/ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2005 by the Blender Foundation. + * All rights reserved. + * + * Contributor(s): Daniel Dunbar + * Ton Roosendaal, + * Ben Batt, + * Brecht Van Lommel, + * Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + * + */ /** \file blender/modifiers/intern/MOD_array.c * \ingroup modifiers @@ -118,25 +116,25 @@ DagNode *curNode = dag_get_node(forest, amd->start_cap); dag_add_relation(forest, curNode, obNode, - DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); + DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); } if (amd->end_cap) { DagNode *curNode = dag_get_node(forest, amd->end_cap); dag_add_relation(forest, curNode, obNode, - DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); + DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); } if (amd->curve_ob) { DagNode *curNode = dag_get_node(forest, amd->curve_ob); dag_add_relation(forest, curNode, obNode, - DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); + DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); } if (amd->offset_ob) { DagNode *curNode = dag_get_node(forest, amd->offset_ob); dag_add_relation(forest, curNode, obNode, - DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); + DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); } } @@ -277,8 +275,8 @@ unit_m4(obinv); mul_serie_m4(result_mat, offset, - obinv, amd->offset_ob->obmat, - NULL, NULL, NULL, NULL, NULL); + obinv, amd->offset_ob->obmat, + NULL, NULL, NULL, NULL, NULL); copy_m4_m4(offset, result_mat); } Property changes on: branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_array.c ___________________________________________________________________ Deleted: svn:keywords - Author Date Id Revision Modified: branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_bevel.c =================================================================== --- branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_bevel.c 2011-12-13 13:03:28 UTC (rev 42605) +++ branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_bevel.c 2011-12-13 16:36:13 UTC (rev 42606) @@ -1,34 +1,32 @@ /* -* $Id$ -* -* ***** BEGIN GPL LICENSE BLOCK ***** -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software Foundation, -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -* -* The Original Code is Copyright (C) 2005 by the Blender Foundation. -* All rights reserved. -* -* Contributor(s): Daniel Dunbar -* Ton Roosendaal, -* Ben Batt, -* Brecht Van Lommel, -* Campbell Barton -* -* ***** END GPL LICENSE BLOCK ***** -* -*/ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs