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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-07 13:16:42 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-07 13:16:42 +0300
commitc2122f01ad867a6889812a73e88fd0d657ef2448 (patch)
tree735768e11e724a9adee077c2abda5901b075dc97 /source/blender/blenkernel/intern/multires.c
parent6920a0cc1dac513f78da5cb721aacc6f0427a0d4 (diff)
Fix #20928: difference boolean modifier is not applied during rendering,
fixed by last depsgraph commit and this extra check to avoid unnecessary free of derivedmesh for sculpt/multires.
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r--source/blender/blenkernel/intern/multires.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 6ed4f7a7703..20f8d4852ce 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -122,6 +122,7 @@ void multires_mark_as_modified(Object *ob)
void multires_force_update(Object *ob)
{
+
if(ob && ob->derivedFinal) {
ob->derivedFinal->needsFree =1;
ob->derivedFinal->release(ob->derivedFinal);
@@ -129,6 +130,12 @@ void multires_force_update(Object *ob)
}
}
+void multires_force_render_update(Object *ob)
+{
+ if(ob && (ob->mode & OB_MODE_SCULPT) && modifiers_findByType(ob, eModifierType_Multires))
+ multires_force_update(ob);
+}
+
/* XXX */
#if 0
void multiresModifier_join(Object *ob)