Skip to content

Commit

Permalink
Update 2.0.0: Initial port to Blender 2.8
Browse files Browse the repository at this point in the history
New:
* Animation Offset: handle Material and Object Data animation.

Removed:
* Animation Offset preset system.
* Animation Offset F-Crurves/NLA option, instead handle both animation types.
* Utility tools for setting Animated and Effectors groups.

Postponed:
* Slow Parent Offset is disabled for now, until Blender 2.8 slow parent functionality will work again.
  • Loading branch information
mrachinskiy committed Jan 6, 2019
1 parent 020b872 commit 9f4c057
Show file tree
Hide file tree
Showing 16 changed files with 646 additions and 558 deletions.
37 changes: 26 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,46 @@ Commotion—is a Blender add-on for motion graphics, made specifically for easy

Video:

* [Demo v1](http://youtu.be/gLj4PvHbm4s)
* [v1 Demo](http://youtu.be/gLj4PvHbm4s)
* [v1.4 Overview](https://youtu.be/YNtaR00sA40)
* [Tutorial: Simple Motiongraphics](http://youtu.be/qbJMTOUdxRY)
* [Update 1.4 Overview](https://youtu.be/YNtaR00sA40)


How to install
==========================

1. Blender 2.77 or newer is required to install the add-on.
2. [Download the add-on.][1]<sup>1</sup>
3. Go to Blender `User Preferences``Add-ons` category.
4. Use `Install Add-on from File` to install add-on from downloaded zip archive.
### Blender 2.80

1. [Download Commotion v2.0.0 dev.][v_dev]<sup>1</sup>
2. Open `Edit``Preferences``Add-ons` category.
3. Use `Install` to install add-on from downloaded zip archive.

### Blender 2.79

1. [Download Commotion v1.7.3.][v1_7_3]<sup>1</sup>
2. Open `File``User Preferences``Add-ons` category.
3. Use `Install Add-on from File` to install add-on from downloaded zip archive.

<sup>1</sup> Note for mac users: Safari browser will automatically unpack downloaded zip archive, so in order to install the add-on, you have to pack folder with add-on files back into zip archive. Or use a different browser to download add-on.


Установка
==========================

1. Для установки аддона требуется Blender 2.77 или новее.
2. [Загрузите аддон.][1]<sup>1</sup>
3. Зайдите в настройки Blender `User Preferences``Add-ons`.
4. Воспользуйтесь `Install Add-on from File` чтобы установить аддон из загруженного архива.
### Blender 2.80

1. [Загрузите Commotion v2.0.0 dev.][v_dev]<sup>1</sup>
2. Откройте `Edit``Preferences``Add-ons`.
3. Воспользуйтесь `Install` чтобы установить аддон из загруженного архива.

### Blender 2.79

1. [Загрузите Commotion v1.7.3.][v1_7_3]<sup>1</sup>
2. Откройте `File``User Preferences``Add-ons`.
3. Воспользуйтесь `Install Add-on from File` чтобы установить аддон из загруженного архива.

<sup>1</sup> Примечание для пользователей mac: браузер Safari автоматически распаковывает скачиваемые zip архивы, поэтому, чтобы установить аддон, необходимо запаковать папку с файлами аддона обратно в zip архив. Или используйте другой браузер для скачивания аддона.


[1]: https://github.com/mrachinskiy/commotion/archive/master.zip
[v_dev]: https://github.com/mrachinskiy/commotion/archive/master.zip
[v1_7_3]: https://github.com/mrachinskiy/commotion/releases/download/v1.7.3/commotion-1_7_3.zip
29 changes: 14 additions & 15 deletions __init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ##### BEGIN GPL LICENSE BLOCK #####
#
# Commotion motion graphics add-on for Blender.
# Copyright (C) 2014-2018 Mikhail Rachinskiy
# Copyright (C) 2014-2019 Mikhail Rachinskiy
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -23,8 +23,8 @@
"name": "Commotion",
"author": "Mikhail Rachinskiy",
"version": (1, 7, 3),
"blender": (2, 77, 0),
"location": "3D View > Tool Shelf",
"blender": (2, 80, 0),
"location": "3D View > Sidebar",
"description": "Animation offset tools for motion graphics.",
"wiki_url": "https://github.com/mrachinskiy/commotion#readme",
"tracker_url": "https://github.com/mrachinskiy/commotion/issues",
Expand All @@ -42,26 +42,26 @@
module = os.path.splitext(entry.name)[0]
importlib.reload(eval(module))

elif entry.is_dir() and not entry.name.startswith((".", "__")) and not entry.name.endswith("updater"):

elif entry.is_dir() and not (entry.name.startswith((".", "__")) and entry.name.endswith("updater")):
for subentry in os.scandir(entry.path):

if subentry.name.endswith(".py"):
module = "{}.{}".format(entry.name, os.path.splitext(subentry.name)[0])
if subentry.is_file() and subentry.name.endswith(".py"):
module = entry.name + "." + os.path.splitext(subentry.name)[0]
importlib.reload(eval(module))
else:
import bpy
from bpy.props import PointerProperty, CollectionProperty
from . import (
proxy_effector,
var,
settings,
ui,
lib,
proxy_effector,
ops_anim,
ops_proxy,
ops_shapekey,
ops_slow_parent,
ops_utils,
addon_updater_ops,
ui,
)
from .op_offset import offset_op

Expand All @@ -72,14 +72,15 @@
settings.CommotionPropertiesScene,
settings.CommotionPropertiesWm,
ui.VIEW3D_PT_commotion_update,
ui.VIEW3D_PT_commotion_shape_keys,
ui.VIEW3D_PT_commotion_animation_offset,
ui.VIEW3D_PT_commotion_slow_parent,
ui.VIEW3D_PT_commotion_animation_utils,
ui.VIEW3D_PT_commotion_shape_keys,
# ui.VIEW3D_PT_commotion_slow_parent,
ui.VIEW3D_PT_commotion_proxy_effector,
offset_op.ANIM_OT_commotion_animation_offset,
ops_shapekey.OBJECT_OT_commotion_sk_coll_refresh,
ops_shapekey.OBJECT_OT_commotion_sk_interpolation_set,
ops_shapekey.ANIM_OT_commotion_sk_auto_keyframes,
ops_shapekey.ANIM_OT_commotion_sk_generate_keyframes,
ops_anim.ANIM_OT_commotion_animation_copy,
ops_anim.ANIM_OT_commotion_animation_link,
ops_anim.ANIM_OT_commotion_animation_convert,
Expand All @@ -88,8 +89,6 @@
ops_slow_parent.OBJECT_OT_commotion_slow_parent_offset,
ops_slow_parent.OBJECT_OT_commotion_slow_parent_toggle,
ops_utils.OBJECT_OT_commotion_preset_apply,
ops_utils.OBJECT_OT_commotion_add_to_group_animated,
ops_utils.OBJECT_OT_commotion_add_to_group_effector,
)


Expand Down
Loading

0 comments on commit 9f4c057

Please sign in to comment.