Commit: 58062680511d3b180e03b6fbb71471c80573b9f3
Author: Campbell Barton
Date: Tue Jun 28 08:31:52 2016 +1000
Branches: master
https://developer.blender.org/rB58062680511d3b180e03b6fbb71471c80573b9f3
Fix MSVC error, co_return now a reserved word
D2073 by @LazyDodo
===================================================================
M source/blender/makesrna/intern/makesrna.c
===================================================================
diff --git a/source/blender/makesrna/intern/makesrna.c
b/source/blender/makesrna/intern/makesrna.c
index 8d3c6cb..f9a4640 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
