Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesrna / intern / makesrna.c
index 8d3c6cb19cfc1e0c0ffcf47fd256ec3b414ec635..94290828e46890f0f8ae4a50cec0723e32690d0d 100644 (file)
@@ -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;
 }
@@ -3295,8 +3299,8 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_animviz.c", NULL, RNA_def_animviz},
        {"rna_actuator.c", "rna_actuator_api.c", RNA_def_actuator},
        {"rna_armature.c", "rna_armature_api.c", RNA_def_armature},
-       {"rna_boid.c", NULL, RNA_def_boid},
        {"rna_brush.c", NULL, RNA_def_brush},
+       {"rna_cachefile.c", NULL, RNA_def_cachefile},
        {"rna_camera.c", "rna_camera_api.c", RNA_def_camera},
        {"rna_cloth.c", NULL, RNA_def_cloth},
        {"rna_color.c", NULL, RNA_def_color},
@@ -3326,7 +3330,6 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_object_force.c", NULL, RNA_def_object_force},
        {"rna_packedfile.c", NULL, RNA_def_packedfile},
        {"rna_palette.c", NULL, RNA_def_palette},
-       {"rna_particle.c", NULL, RNA_def_particle},
        {"rna_pose.c", "rna_pose_api.c", RNA_def_pose},
        {"rna_property.c", NULL, RNA_def_gameproperty},
        {"rna_render.c", NULL, RNA_def_render},