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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-04-01 16:53:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-05 11:36:12 +0300
commit713669f7e67e1e5fc01caaa9c9a2da932d71759a (patch)
tree7999242d7edd7439c32d8e5673e242ca56dcf3c3
parent18875f6aa3a2cab1c82e23b799bb0a831e18b4df (diff)
Cycles: Support deformation motion blur for curves deformed by taper
-rw-r--r--source/blender/blenkernel/intern/object.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index f81f13ec3a9..d78b49b9f9a 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3653,6 +3653,14 @@ static bool object_moves_in_time(Object *object)
return false;
}
+static bool object_deforms_in_time(Object *object)
+{
+ if (BKE_key_from_object(object) != NULL) {
+ return true;
+ }
+ return object_moves_in_time(object);
+}
+
static bool constructive_modifier_is_deform_modified(ModifierData *md)
{
/* TODO(sergey): Consider generalizing this a bit so all modifier logic
@@ -3712,8 +3720,16 @@ int BKE_object_is_deform_modified(Scene *scene, Object *ob)
int flag = 0;
const bool is_modifier_animated = modifiers_has_animation_check(ob);
- if (BKE_key_from_object(ob))
+ if (BKE_key_from_object(ob)) {
flag |= eModifierMode_Realtime | eModifierMode_Render;
+ }
+
+ if (ob->type == OB_CURVE) {
+ Curve *cu = (Curve *)ob->data;
+ if (cu->taperobj != NULL && object_deforms_in_time(cu->taperobj)) {
+ flag |= eModifierMode_Realtime | eModifierMode_Render;
+ }
+ }
/* cloth */
for (md = modifiers_getVirtualModifierList(ob, &virtualModifierData);