Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesrna / intern / makesrna.c
index ff081a56b61afb8a65fd291ae41f8dab39983b01..b927daf2ac017bbfdc810c10e9138c0876fabf42 100644 (file)
@@ -3010,7 +3010,7 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
        else fprintf(f, "NULL,\n");
        fprintf(f, "\t%d, ", prop->magic);
        rna_print_c_string(f, prop->identifier);
-       fprintf(f, ", %d, %d, %d, ", prop->flag, prop->flag_parameter, prop->flag_internal);
+       fprintf(f, ", %d, %d, %d, %d, ", prop->flag, prop->flag_parameter, prop->flag_internal, prop->tags);
        rna_print_c_string(f, prop->name); fprintf(f, ",\n\t");
        rna_print_c_string(f, prop->description); fprintf(f, ",\n\t");
        fprintf(f, "%d, ", prop->icon);
@@ -3254,7 +3254,7 @@ static void rna_generate_struct(BlenderRNA *UNUSED(brna), StructRNA *srna, FILE
        fprintf(f, "\t");
        rna_print_c_string(f, srna->identifier);
        fprintf(f, ", NULL, NULL"); /* PyType - Cant initialize here */
-       fprintf(f, ", %d, ", srna->flag);
+       fprintf(f, ", %d, NULL, ", srna->flag);
        rna_print_c_string(f, srna->name);
        fprintf(f, ",\n\t");
        rna_print_c_string(f, srna->description);
@@ -3337,7 +3337,6 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_context.c", NULL, RNA_def_context},
        {"rna_controller.c", "rna_controller_api.c", RNA_def_controller},
        {"rna_curve.c", "rna_curve_api.c", RNA_def_curve},
-       {"rna_depsgraph.c", NULL, RNA_def_depsgraph},
        {"rna_dynamicpaint.c", NULL, RNA_def_dynamic_paint},
        {"rna_fcurve.c", "rna_fcurve_api.c", RNA_def_fcurve},
        {"rna_fluidsim.c", NULL, RNA_def_fluidsim},
@@ -3347,6 +3346,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_key.c", NULL, RNA_def_key},
        {"rna_lamp.c", NULL, RNA_def_lamp},
        {"rna_lattice.c", "rna_lattice_api.c", RNA_def_lattice},
+       {"rna_layer.c", NULL, RNA_def_view_layer},
        {"rna_linestyle.c", NULL, RNA_def_linestyle},
        {"rna_main.c", "rna_main_api.c", RNA_def_main},
        {"rna_material.c", "rna_material_api.c", RNA_def_material},
@@ -3357,10 +3357,12 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_nodetree.c", NULL, RNA_def_nodetree},
        {"rna_object.c", "rna_object_api.c", RNA_def_object},
        {"rna_object_force.c", NULL, RNA_def_object_force},
+       {"rna_depsgraph.c", NULL, RNA_def_depsgraph},
        {"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_lightprobe.c", NULL, RNA_def_lightprobe},
        {"rna_property.c", NULL, RNA_def_gameproperty},
        {"rna_render.c", NULL, RNA_def_render},
        {"rna_rigidbody.c", NULL, RNA_def_rigidbody},
@@ -3380,6 +3382,8 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_userdef.c", NULL, RNA_def_userdef},
        {"rna_vfont.c", "rna_vfont_api.c", RNA_def_vfont},
        {"rna_wm.c", "rna_wm_api.c", RNA_def_wm},
+       {"rna_wm_manipulator.c", "rna_wm_manipulator_api.c", RNA_def_wm_manipulator},
+       {"rna_workspace.c", NULL, RNA_def_workspace},
        {"rna_world.c", NULL, RNA_def_world},
        {"rna_movieclip.c", NULL, RNA_def_movieclip},
        {"rna_tracking.c", NULL, RNA_def_tracking},
@@ -3710,6 +3714,9 @@ static const char *cpp_classes = ""
 "      operator void*() { return ptr.data; }\n"
 "      operator bool() { return ptr.data != NULL; }\n"
 "\n"
+"      bool operator==(const Pointer &other) { return ptr.data == other.ptr.data; }\n"
+"      bool operator!=(const Pointer &other) { return ptr.data != other.ptr.data; }\n"
+"\n"
 "      PointerRNA ptr;\n"
 "};\n"
 "\n"