Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-06-28 01:31:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-06-28 01:35:05 +0300
commit58062680511d3b180e03b6fbb71471c80573b9f3 (patch)
tree5b23f5a53de6cc8420f2f2c116a23268b7cc9986
parentf738f66f1be736aec31f3640d35168a2e24f39f8 (diff)
Fix MSVC error, co_return now a reserved word
D2073 by @LazyDodo
-rw-r--r--source/blender/makesrna/intern/makesrna.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 8d3c6cb19cf..f9a46409aea 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -227,6 +227,10 @@ static const char *rna_safe_id(const char *id)
return "operator_value";
else if (STREQ(id, "new"))
return "create";
+ else if (STREQ(id, "co_return")) {
+ /* MSVC2015, C++ uses for coroutines */
+ return "coord_return";
+ }
return id;
}