diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:00 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:00 -0300 |
| commit | 954256268afe89b648d356ee0b296a9e97a07373 (patch) | |
| tree | 36c42fb01f05d26bbae438d470676c9487b47a04 /tools/editor/property_editor.h | |
| parent | 0e1510214a7585d5446f06344468ab52298cfa81 (diff) | |
| parent | ab99671bb835a5fe24a092ec34afe1ad862ac254 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
demos/2d/motion/engine.cfg
Diffstat (limited to 'tools/editor/property_editor.h')
| -rw-r--r-- | tools/editor/property_editor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/property_editor.h b/tools/editor/property_editor.h index 7a7354c88e..164643afaa 100644 --- a/tools/editor/property_editor.h +++ b/tools/editor/property_editor.h @@ -187,6 +187,7 @@ class PropertyEditor : public Control { Node *get_instanced_node(); void _refresh_item(TreeItem *p_item); + void _set_range_def(Object *p_item, String prop, float p_frame); UndoRedo *undo_redo; protected: |