diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-03 06:16:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-03 06:16:52 +0400 |
| commit | c0eec8f379bb0c265e7bf2ad74397c22836bae3c (patch) | |
| tree | 6502b4e6eaf44a848bebe6406aacd825738877d9 /source/blender/editors/include/ED_object.h | |
| parent | 68c4368001db49bd3daab96352ca3b4fb7d04e1c (diff) | |
| parent | 84437bb5e9342e67f448e26adb0c4b0811f3ef5c (diff) | |
svn merge ^/trunk/blender -r43062:43085
Diffstat (limited to 'source/blender/editors/include/ED_object.h')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index e7d753ff45c..a52012283a3 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -56,7 +56,8 @@ struct wmOperator; struct wmOperatorType; /* object_edit.c */ -struct Object *ED_object_active_context(struct bContext *C); +struct Object *ED_object_context(struct bContext *C); /* context.object */ +struct Object *ED_object_active_context(struct bContext *C); /* context.object or context.active_object */ /* object_ops.c */ void ED_operatortypes_object(void); |