Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElia Sarti <vekoon@gmail.com>2010-03-25 13:43:55 +0300
committerElia Sarti <vekoon@gmail.com>2010-03-25 13:43:55 +0300
commit57b2ea62ab6f2f8e6dbd8cd51be0ef93b65ef34a (patch)
tree86cb8120724ac65a22966e180930cce6cc5083a2 /source/blender/blenkernel/intern/modifier.c
parent2ae418e0a87dff7f259792434615caaabfe8541f (diff)
Remove object type check in Cast Modifier deformation, was wrong now that Curves support modifiers.
Also fixes [#21742] Crashes when adding a Cast mod after a Screw mod on a Curve Object
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
-rw-r--r--source/blender/blenkernel/intern/modifier.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 7be0cb3e3ed..5cda09cad85 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -4816,11 +4816,7 @@ static void castModifier_deformVerts(
DerivedMesh *dm = NULL;
CastModifierData *cmd = (CastModifierData *)md;
- if (ob->type == OB_MESH) {
- /* DerivedMesh is used only in case object is MESH */
- /* so we could optimize modifier applying by skipping DM creation */
- dm = get_dm(md->scene, ob, NULL, derivedData, NULL, 0);
- }
+ dm = get_dm(md->scene, ob, NULL, derivedData, NULL, 0);
if (cmd->type == MOD_CAST_TYPE_CUBOID) {
castModifier_cuboid_do(cmd, ob, dm, vertexCos, numVerts);