Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / blender / blender_sync.h
index 9e8d494f83b542aa9c54afd617d0867e0324b8e0..2ea86ba11332eed310a2f2072d19c66475277d08 100644 (file)
@@ -125,7 +125,7 @@ private:
                         BL::Mesh& b_mesh,
                         BL::Object& b_ob,
                         bool motion,
-                        int time_index = 0);
+                        int motion_step = 0);
        Object *sync_object(BL::Depsgraph& b_depsgraph,
                            BL::Depsgraph::duplis_iterator& b_dupli_iter,
                            uint layer_flag,