summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2019-09-20 17:58:06 -0300
committerJuan Linietsky <reduzio@gmail.com>2020-02-11 12:01:26 +0100
commit123ee5995c989d7c2f0bb320fe94ef1702a48c13 (patch)
tree97855b3218f56dcaaeb5e737bf1a919f28ac36db /core
parentdc32083681a770e9d7e332c5beed30b52c793752 (diff)
Visual GPU profiler and related profiling support in Vulkan.
Diffstat (limited to 'core')
-rw-r--r--core/color.cpp8
-rw-r--r--core/color.h7
2 files changed, 6 insertions, 9 deletions
diff --git a/core/color.cpp b/core/color.cpp
index 1baa8af45d..cb3068c487 100644
--- a/core/color.cpp
+++ b/core/color.cpp
@@ -529,14 +529,6 @@ Color Color::operator+(const Color &p_color) const {
a + p_color.a);
}
-void Color::operator+=(const Color &p_color) {
-
- r = r + p_color.r;
- g = g + p_color.g;
- b = b + p_color.b;
- a = a + p_color.a;
-}
-
Color Color::operator-(const Color &p_color) const {
return Color(
diff --git a/core/color.h b/core/color.h
index cfdd211b69..75a2b07d71 100644
--- a/core/color.h
+++ b/core/color.h
@@ -70,7 +70,12 @@ struct Color {
}
Color operator+(const Color &p_color) const;
- void operator+=(const Color &p_color);
+ _FORCE_INLINE_ void operator+=(const Color &p_color) {
+ r = r + p_color.r;
+ g = g + p_color.g;
+ b = b + p_color.b;
+ a = a + p_color.a;
+ }
Color operator-() const;
Color operator-(const Color &p_color) const;