Manual merge of soc-2009-kazanbas branch:
[blender.git] / source / blender / makesrna / intern / makesrna.c
index 3e61000..961fb9a 100644 (file)
@@ -1969,7 +1969,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
        {"rna_rna.c", NULL, RNA_def_rna},
        {"rna_ID.c", NULL, RNA_def_ID},
        {"rna_texture.c", NULL, RNA_def_texture},
-       {"rna_action.c", NULL, RNA_def_action},
+       {"rna_action.c", "rna_action_api.c", RNA_def_action},
        {"rna_animation.c", "rna_animation_api.c", RNA_def_animation},
        {"rna_actuator.c", NULL, RNA_def_actuator},
        {"rna_armature.c", NULL, RNA_def_armature},
@@ -1986,12 +1986,12 @@ RNAProcessItem PROCESS_ITEMS[]= {
        {"rna_fluidsim.c", NULL, RNA_def_fluidsim},
        {"rna_gpencil.c", NULL, RNA_def_gpencil},
        {"rna_group.c", NULL, RNA_def_group},
-       {"rna_image.c", NULL, RNA_def_image},
+       {"rna_image.c", "rna_image_api.c", RNA_def_image},
        {"rna_key.c", NULL, RNA_def_key},
        {"rna_lamp.c", NULL, RNA_def_lamp},
        {"rna_lattice.c", NULL, RNA_def_lattice},
        {"rna_main.c", "rna_main_api.c", RNA_def_main},
-       {"rna_material.c", NULL, RNA_def_material},
+       {"rna_material.c", "rna_material_api.c", RNA_def_material},
        {"rna_mesh.c", "rna_mesh_api.c", RNA_def_mesh},
        {"rna_meta.c", NULL, RNA_def_meta},
        {"rna_modifier.c", NULL, RNA_def_modifier},
@@ -2001,7 +2001,7 @@ RNAProcessItem PROCESS_ITEMS[]= {
        {"rna_object_force.c", NULL, RNA_def_object_force},
        {"rna_packedfile.c", NULL, RNA_def_packedfile},
        {"rna_particle.c", NULL, RNA_def_particle},
-       {"rna_pose.c", NULL, RNA_def_pose},
+       {"rna_pose.c", "rna_pose_api.c", RNA_def_pose},
        {"rna_property.c", NULL, RNA_def_gameproperty},
        {"rna_render.c", NULL, RNA_def_render},
        {"rna_scene.c", "rna_scene_api.c", RNA_def_scene},