diff options
| author | Juan Linietsky | 2015-03-03 14:41:36 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-03-03 14:41:36 -0300 |
| commit | 2c2894ceb674927a35d2798b3e63adabdb020077 (patch) | |
| tree | 9e8950e0acc8fb7531fa60ce8c0321a5b60c335a /core/dvector.h | |
| parent | 4d2198110b4af7f203eeef95697255569e49bce7 (diff) | |
| parent | a0ee5cc3531786a652ee43d3a57cb69dff34bd70 (diff) | |
| download | godot-2c2894ceb674927a35d2798b3e63adabdb020077.tar.gz godot-2c2894ceb674927a35d2798b3e63adabdb020077.tar.zst godot-2c2894ceb674927a35d2798b3e63adabdb020077.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
modules/gdscript/gd_tokenizer.cpp
scene/resources/shader_graph.h
Diffstat (limited to 'core/dvector.h')
| -rw-r--r-- | core/dvector.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/core/dvector.h b/core/dvector.h index 72661882c..29be41784 100644 --- a/core/dvector.h +++ b/core/dvector.h @@ -262,6 +262,23 @@ public: w[bs+i]=r[i]; } + + Error insert(int p_pos,const T& p_val) { + + int s=size(); + ERR_FAIL_INDEX_V(p_pos,s+1,ERR_INVALID_PARAMETER); + resize(s+1); + { + Write w = write(); + for (int i=s;i>p_pos;i--) + w[i]=w[i-1]; + w[p_pos]=p_val; + } + + return OK; + } + + bool is_locked() const { return mem.is_locked(); } inline const T operator[](int p_index) const; |