[Bf-blender-cvs] [713669f] blender-v2.77-release: Cycles: Support deformation motion blur for curves deformed by taper

[Sergey Sharybin]

Commit: 713669f7e67e1e5fc01caaa9c9a2da932d71759a
Author: Sergey Sharybin
Date:   Fri Apr 1 15:53:40 2016 +0200
Branches: blender-v2.77-release
https://developer.blender.org/rB713669f7e67e1e5fc01caaa9c9a2da932d71759a

Cycles: Support deformation motion blur for curves deformed by taper

===================================================================

M       source/blender/blenkernel/intern/object.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object.c 
b/source/blender/blenkernel/intern/object.c
index f81f13e..d78b49b 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);

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