diff options
| author | Rémi Verschelde | 2016-03-09 00:14:08 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2016-03-09 00:14:08 +0100 |
| commit | e46e43d2aaa6339a1675eb989f41885e745bf5c3 (patch) | |
| tree | cf91f2869ff8f058c6682569fb31e22e5ee736ad /core/variant_op.cpp | |
| parent | 1dad6eca812e5c2e313b54265114de8a1d73d999 (diff) | |
| parent | 4a4f2479146aa33e235ed57cde311efda68d3c8f (diff) | |
| download | godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.gz godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.zst godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.zip | |
Merge pull request #3928 from Marqin/whitespace
remove trailing whitespace - sorry for the broken PRs, please rebase :)
Diffstat (limited to 'core/variant_op.cpp')
| -rw-r--r-- | core/variant_op.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 9887c50dd..f03ab43fc 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -662,7 +662,7 @@ void Variant::evaluate(const Operator& p_op, const Variant& p_a, const Variant& case OP_DIVIDE: { switch(p_a.type) { - DEFAULT_OP_FAIL(NIL); + DEFAULT_OP_FAIL(NIL); DEFAULT_OP_NUM(/,BOOL,_bool); case INT: { switch(p_b.type) { @@ -779,7 +779,7 @@ void Variant::evaluate(const Operator& p_op, const Variant& p_a, const Variant& } #endif _RETURN( p_a._data._int % p_b._data._int ); - + } else if (p_a.type==STRING) { const String* format=reinterpret_cast<const String*>(p_a._data._mem); @@ -2409,7 +2409,7 @@ Variant Variant::get(const Variant& p_index, bool *r_valid) const { } if (str=="value") { valid=true; return ie.joy_motion.axis_value; - } + } } if (ie.type==InputEvent::SCREEN_TOUCH) { |