archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Modifiers on Lattices now work

Browse Source 
Tested with Hook and Armature modifiers. Requires CoW to be enabled.
This commit is contained in:
Sybren A. Stüvel
2018-05-15 17:16:20 +02:00
parent 87cd4de3ba
commit b6e3430417
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/lattice.c
View File

@@ -65,6 +65,8 @@
#include "BKE_deform.h" #include "BKE_deform.h"
#include "DEG_depsgraph_query.h"
int BKE_lattice_index_from_uvw(Lattice *lt, int BKE_lattice_index_from_uvw(Lattice *lt,
const int u, const int v, const int w) const int u, const int v, const int w)
{ {
@@ -1022,6 +1024,8 @@ void BKE_lattice_vertexcos_apply(struct Object *ob, float (*vertexCos)[3])
void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, Scene *scene, Object *ob) void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, Scene *scene, Object *ob)
{ {
Lattice *lt = ob->data; Lattice *lt = ob->data;
/* Get vertex coordinates from the original copy; otherwise we get already-modified coordinates. */
Object *orig_ob = DEG_get_original_object(ob);
VirtualModifierData virtualModifierData; VirtualModifierData virtualModifierData;
ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData); ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
float (*vertexCos)[3] = NULL; float (*vertexCos)[3] = NULL;
@@ -1046,14 +1050,20 @@ void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, Scene *scene, Objec
if (mti->isDisabled && mti->isDisabled(md, 0)) continue; if (mti->isDisabled && mti->isDisabled(md, 0)) continue;
if (mti->type != eModifierTypeType_OnlyDeform) continue; if (mti->type != eModifierTypeType_OnlyDeform) continue;
if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(ob, &numVerts); if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(orig_ob, &numVerts);
modifier_deformVerts_DM_deprecated(md, &mectx, NULL, vertexCos, numVerts); modifier_deformVerts_DM_deprecated(md, &mectx, NULL, vertexCos, numVerts);
} }
/* always displist to make this work like derivedmesh */ if (ob->id.tag & LIB_TAG_COPY_ON_WRITE) {
if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(ob, &numVerts); if (vertexCos) {
BKE_lattice_vertexcos_apply(ob, vertexCos);
{ MEM_freeN(vertexCos);
}
}
else {
/* Displist won't do anything; this is just for posterity's sake until we remove it. */
if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(orig_ob, &numVerts);
DispList *dl = MEM_callocN(sizeof(*dl), "lt_dl"); DispList *dl = MEM_callocN(sizeof(*dl), "lt_dl");
dl->type = DL_VERTS; dl->type = DL_VERTS;
dl->parts = 1; dl->parts = 1;

4
source/blender/draw/intern/draw_cache_impl_lattice.c
View File

@@ -315,8 +315,8 @@ static bool lattice_batch_cache_valid(Lattice *lt)
return false; return false;
} }
if (cache->is_dirty == false) { if (cache->is_dirty) {
return true; return false;
} }
else { else {
if (cache->is_editmode) { if (cache->is_editmode) {