1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton 2017-06-02 15:39:25 +10:00
commit eae486f5e6
19 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/python_api/examples/bpy.types.Operator.5.py
View File

@ -2,13 +2,14 @@
Modal Execution Modal Execution
+++++++++++++++ +++++++++++++++
This operator defines a :class:`Operator.modal` function which running, This operator defines a :class:`Operator.modal` function that will keep being
handling events until it returns ``{'FINISHED'}`` or ``{'CANCELLED'}``. run to handle events until it returns ``{'FINISHED'}`` or ``{'CANCELLED'}``.
Grab, Rotate, Scale and Fly-Mode are examples of modal operators. Modal operators run every time a new event is detected, such as a mouse click
They are especially useful for interactive tools, or key press. Conversely, when no new events are detected, the modal operator
your operator can have its own state where keys toggle options as the operator will not run. Modal operators are especially useful for interactive tools, an
runs. operator can have its own state where keys toggle options as the operator runs.
Grab, Rotate, Scale, and Fly-Mode are examples of modal operators.
:class:`Operator.invoke` is used to initialize the operator as being by :class:`Operator.invoke` is used to initialize the operator as being by
returning ``{'RUNNING_MODAL'}``, initializing the modal loop. returning ``{'RUNNING_MODAL'}``, initializing the modal loop.

3
source/blender/alembic/intern/alembic_capi.cc
View File

@ -470,7 +470,8 @@ static std::pair<bool, AbcObjectReader *> visit_object(
else { else {
if (child_claims_this_object) { if (child_claims_this_object) {
claiming_child_readers.push_back(child_reader); claiming_child_readers.push_back(child_reader);
} else { }
else {
nonclaiming_child_readers.push_back(child_reader); nonclaiming_child_readers.push_back(child_reader);
} }
} }