[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42639] trunk/blender/source/blender/ modifiers/intern/MOD_hook.c: New fix for [#29543] Hook modifier: falloff + vgroup influence broken

[Bastien Montagne]

Revision: 42639
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42639
Author:   mont29
Date:     2011-12-15 08:57:48 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
New fix for [#29543] Hook modifier: falloff + vgroup influence broken

Don't know why, but creating a dm when there was none broke multi hooks on 
curves (see #29567)... So as a valid dm is only mandatory for meshes when a 
vgroup is set, only create it in those cases!

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_hook.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_hook.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_hook.c    2011-12-15 
08:01:49 UTC (rev 42638)
+++ trunk/blender/source/blender/modifiers/intern/MOD_hook.c    2011-12-15 
08:57:48 UTC (rev 42639)
@@ -249,15 +249,25 @@
                         int UNUSED(useRenderParams), int UNUSED(isFinalCalc))
 {
        HookModifierData *hmd = (HookModifierData*) md;
-       
-       deformVerts_do(hmd, ob, derivedData, vertexCos, numVerts);
+       DerivedMesh *dm = derivedData;
+       /* We need a valid dm for meshes when a vgroup is set... */
+       if(!dm && ob->type == OB_MESH && hmd->name[0] != '\0')
+               dm = get_dm(ob, NULL, dm, NULL, 0);
+
+       deformVerts_do(hmd, ob, dm, vertexCos, numVerts);
+
+       if(derivedData != dm)
+               dm->release(dm);
 }
 
 static void deformVertsEM(ModifierData *md, Object *ob, struct EditMesh 
*editData,
                           DerivedMesh *derivedData, float (*vertexCos)[3], int 
numVerts)
 {
        HookModifierData *hmd = (HookModifierData*) md;
-       DerivedMesh *dm = get_dm(ob, editData, derivedData, NULL, 0);
+       DerivedMesh *dm = derivedData;
+       /* We need a valid dm for meshes when a vgroup is set... */
+       if(!dm && ob->type == OB_MESH && hmd->name[0] != '\0')
+               dm = get_dm(ob, editData, dm, NULL, 0);
 
        deformVerts_do(hmd, ob, dm, vertexCos, numVerts);
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs