diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 6102ccb0f34..1f066a7209d 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -330,22 +330,31 @@ typedef struct ExtensionRNA { /* fake struct definitions, needed otherwise collections end up owning the C * structs like 'Object' when defined first */ -#define MainCameras Main -#define MainScenes Main -#define MainArmatures Main -#define MainMaterials Main -#define MainMeshes Main -#define MainLamps Main -#define MainImages Main -#define MainObjects Main -#define MainTexts Main -#define MainActions Main -#define MainGroups Main -#define MainTextures Main -#define MainCurves Main -#define MainBrushes Main -#define MainLattices Main -#define MainMetaBall Main +#define MainActions Main +#define MainArmatures Main +#define MainBrushes Main +#define MainCameras Main +#define MainCurves Main +#define MainFonts Main +#define MainGreasePencils Main +#define MainGroups Main +#define MainImages Main +#define MainLamps Main +#define MainLattices Main +#define MainLibraries Main +#define MainMaterials Main +#define MainMeshes Main +#define MainMetaBalls Main +#define MainNodeTrees Main +#define MainObjects Main +#define MainParticles Main +#define MainScenes Main +#define MainScreens Main +#define MainSounds Main +#define MainTexts Main +#define MainTextures Main +#define MainWindowManagers Main +#define MainWorlds Main #ifdef __cplusplus } diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index df0159d22a4..4f37195068a 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -127,6 +127,27 @@ static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, FCurve * } } +static TimeMarker *rna_Action_pose_markers_new(bAction *act, ReportList *reports, char name[]) +{ + TimeMarker *marker = MEM_callocN(sizeof(TimeMarker), "TimeMarker"); + marker->flag= 1; + marker->frame= 1; + BLI_strncpy(marker->name, name, sizeof(marker->name)); + BLI_addtail(&act->markers, marker); + return marker; +} + +static void rna_Action_pose_markers_remove(bAction *act, ReportList *reports, TimeMarker *marker) +{ + if (!BLI_remlink_safe(&act->markers, marker)) { + BKE_reportf(reports, RPT_ERROR, "TimelineMarker '%s' not found in action '%s'", marker->name, act->id.name+2); + return; + } + + /* XXX, invalidates PyObject */ + MEM_freeN(marker); +} + #else static void rna_def_dopesheet(BlenderRNA *brna) @@ -379,6 +400,34 @@ static void rna_def_action_fcurves(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); } +static void rna_def_action_pose_markers(BlenderRNA *brna, PropertyRNA *cprop) +{ + StructRNA *srna; + + FunctionRNA *func; + PropertyRNA *parm; + + RNA_def_property_srna(cprop, "ActionPoseMarkers"); + srna= RNA_def_struct(brna, "ActionPoseMarkers", NULL); + RNA_def_struct_sdna(srna, "bAction"); + RNA_def_struct_ui_text(srna, "Action Pose Markers", "Collection of timeline markers"); + + func= RNA_def_function(srna, "new", "rna_Action_pose_markers_new"); + RNA_def_function_ui_description(func, "Add a pose marker to the action."); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm= RNA_def_string(func, "name", "Marker", 0, "", "New name for the marker (not unique)."); + RNA_def_property_flag(parm, PROP_REQUIRED); + + parm= RNA_def_pointer(func, "marker", "TimelineMarker", "", "Newly created marker"); + RNA_def_function_return(func, parm); + + func= RNA_def_function(srna, "remove", "rna_Action_pose_markers_remove"); + RNA_def_function_ui_description(func, "Remove a timeline marker."); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm= RNA_def_pointer(func, "marker", "TimelineMarker", "", "Timeline marker to remove."); + RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); +} + static void rna_def_action(BlenderRNA *brna) { StructRNA *srna; @@ -405,6 +454,7 @@ static void rna_def_action(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, NULL, "markers", NULL); RNA_def_property_struct_type(prop, "TimelineMarker"); RNA_def_property_ui_text(prop, "Pose Markers", "Markers specific to this Action, for labeling poses"); + rna_def_action_pose_markers(brna, prop); RNA_api_action(srna); } diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index ba1bc29ebf1..d2acb49bae2 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -53,6 +53,10 @@ #include "BKE_brush.h" #include "BKE_lattice.h" #include "BKE_mball.h" +#include "BKE_world.h" +#include "BKE_particle.h" +#include "BKE_font.h" +#include "BKE_node.h" #include "DNA_armature_types.h" #include "DNA_camera_types.h" @@ -67,6 +71,10 @@ #include "DNA_brush_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" +#include "DNA_world_types.h" +#include "DNA_particle_types.h" +#include "DNA_vfont_types.h" +#include "DNA_node_types.h" #include "ED_screen.h" @@ -196,6 +204,23 @@ void rna_Main_materials_remove(Main *bmain, ReportList *reports, struct Material /* XXX python now has invalid pointer? */ } +// XXX, commended for now, need to see how this can be used with node groups. +struct bNodeTree *rna_Main_nodetree_new(Main *bmain, int type) +{ + bNodeTree *tree = ntreeAddTree(type); + tree->id.us--; + return tree; +} +void rna_Main_nodetree_remove(Main *bmain, ReportList *reports, struct bNodeTree *tree) +{ + if(ID_REAL_USERS(tree) <= 0) + free_libblock(&bmain->nodetree, tree); + else + BKE_reportf(reports, RPT_ERROR, "Node Tree \"%s\" must have zero users to be removed, found %d.", tree->id.name+2, ID_REAL_USERS(tree)); + + /* XXX python now has invalid pointer? */ +} + Mesh *rna_Main_meshes_new(Main *bmain, char* name) { Mesh *me= add_mesh(name); @@ -291,6 +316,20 @@ void rna_Main_metaballs_remove(Main *bmain, ReportList *reports, struct MetaBall BKE_reportf(reports, RPT_ERROR, "MetaBall \"%s\" must have zero users to be removed, found %d.", mb->id.name+2, ID_REAL_USERS(mb)); } +VFont *rna_Main_fonts_load(Main *bmain, char *filename) +{ + return load_vfont(filename); +} +void rna_Main_fonts_remove(Main *bmain, ReportList *reports, VFont *vfont) +{ + if(ID_REAL_USERS(vfont) <= 0) + free_libblock(&bmain->vfont, vfont); + else + BKE_reportf(reports, RPT_ERROR, "Font \"%s\" must have zero users to be removed, found %d.", vfont->id.name+2, ID_REAL_USERS(vfont)); + + /* XXX python now has invalid pointer? */ +} + Tex *rna_Main_textures_new(Main *bmain, char* name) { Tex *tex= add_texture(name); @@ -319,6 +358,20 @@ void rna_Main_brushes_remove(Main *bmain, ReportList *reports, struct Brush *bru BKE_reportf(reports, RPT_ERROR, "Brush \"%s\" must have zero users to be removed, found %d.", brush->id.name+2, ID_REAL_USERS(brush)); } +World *rna_Main_worlds_new(Main *bmain, char* name) +{ + World *world = add_world(name); + world->id.us--; + return world; +} +void rna_Main_worlds_remove(Main *bmain, ReportList *reports, struct World *world) +{ + if(ID_REAL_USERS(world) <= 0) + free_libblock(&bmain->world, world); + else + BKE_reportf(reports, RPT_ERROR, "World \"%s\" must have zero users to be removed, found %d.", world->id.name+2, ID_REAL_USERS(world)); +} + Group *rna_Main_groups_new(Main *bmain, char* name) { return add_group(name); @@ -383,6 +436,22 @@ void rna_Main_actions_remove(Main *bmain, ReportList *reports, bAction *act) /* XXX python now has invalid pointer? */ } +ParticleSettings *rna_Main_particles_new(Main *bmain, char* name) +{ + ParticleSettings *part = psys_new_settings(name, bmain); + part->id.us--; + return part; +} +void rna_Main_particles_remove(Main *bmain, ReportList *reports, ParticleSettings *part) +{ + if(ID_REAL_USERS(part) <= 0) + free_libblock(&bmain->particle, part); + else + BKE_reportf(reports, RPT_ERROR, "Particle Settings \"%s\" must have zero users to be removed, found %d.", part->id.name+2, ID_REAL_USERS(part)); + + /* XXX python now has invalid pointer? */ +} + #else void RNA_api_main(StructRNA *srna) @@ -510,7 +579,35 @@ void RNA_def_main_materials(BlenderRNA *brna, PropertyRNA *cprop) } void RNA_def_main_node_groups(BlenderRNA *brna, PropertyRNA *cprop) { + StructRNA *srna; + FunctionRNA *func; + PropertyRNA *parm; + static EnumPropertyItem node_nodetree_items[] = { + {0, "SHADER", 0, "Shader", ""}, + {1, "COMPOSITE", 0, "Composite", ""}, + {2, "TEXTURE", 0, "Texture", ""}, + {0, NULL, 0, NULL, NULL}}; + + RNA_def_property_srna(cprop, "MainNodeTrees"); + srna= RNA_def_struct(brna, "MainNodeTrees", NULL); + RNA_def_struct_ui_text(srna, "Main Node Trees", "Collection of node trees"); + +#if 0 // need to see some examples of using these functions before enabling. + func= RNA_def_function(srna, "new", "rna_Main_nodetree_new"); + RNA_def_function_ui_description(func, "Add a new node tree to the main database"); + parm= RNA_def_enum(func, "type", node_nodetree_items, 0, "Type", "The type of curve object to add"); + RNA_def_property_flag(parm, PROP_REQUIRED); + /* return type */ + parm= RNA_def_pointer(func, "tree", "NodeTree", "", "New node tree datablock."); + RNA_def_function_return(func, parm); + + func= RNA_def_function(srna, "remove", "rna_Main_nodetree_remove"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + RNA_def_function_ui_description(func, "Remove a node tree from the current blendfile."); + parm= RNA_def_pointer(func, "tree", "NodeTree", "", "Node tree to remove."); + RNA_def_property_flag(parm, PROP_REQUIRED); +#endif } void RNA_def_main_meshes(BlenderRNA *brna, PropertyRNA *cprop) { @@ -664,8 +761,8 @@ void RNA_def_main_metaballs(BlenderRNA *brna, PropertyRNA *cprop) FunctionRNA *func; PropertyRNA *parm; - RNA_def_property_srna(cprop, "MainMetaBall"); - srna= RNA_def_struct(brna, "MainMetaBall", NULL); + RNA_def_property_srna(cprop, "MainMetaBalls"); + srna= RNA_def_struct(brna, "MainMetaBalls", NULL); RNA_def_struct_ui_text(srna, "Main MetaBall", "Collection of metaballs"); func= RNA_def_function(srna, "new", "rna_Main_metaballs_new"); @@ -684,7 +781,27 @@ void RNA_def_main_metaballs(BlenderRNA *brna, PropertyRNA *cprop) } void RNA_def_main_fonts(BlenderRNA *brna, PropertyRNA *cprop) { + StructRNA *srna; + FunctionRNA *func; + PropertyRNA *parm; + RNA_def_property_srna(cprop, "MainFonts"); + srna= RNA_def_struct(brna, "MainFonts", NULL); + RNA_def_struct_ui_text(srna, "Main Fonts", "Collection of fonts"); + + func= RNA_def_function(srna, "load", "rna_Main_fonts_load"); + RNA_def_function_ui_description(func, "Load a new font into the main database"); + parm= RNA_def_string(func, "filename", "File Name", 0, "", "path of the font to load."); + RNA_def_property_flag(parm, PROP_REQUIRED); + /* return type */ + parm= RNA_def_pointer(func, "vfont", "VectorFont", "", "New font datablock."); + RNA_def_function_return(func, parm); + + func= RNA_def_function(srna, "remove", "rna_Main_fonts_remove"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + RNA_def_function_ui_description(func, "Remove a font from the current blendfile."); + parm= RNA_def_pointer(func, "vfont", "VectorFont", "", "Font to remove."); + RNA_def_property_flag(parm, PROP_REQUIRED); } void RNA_def_main_textures(BlenderRNA *brna, PropertyRNA *cprop) { @@ -734,10 +851,32 @@ void RNA_def_main_brushes(BlenderRNA *brna, PropertyRNA *cprop) parm= RNA_def_pointer(func, "brush", "Brush", "", "Brush to remove."); RNA_def_property_flag(parm, PROP_REQUIRED); } + void RNA_def_main_worlds(BlenderRNA *brna, PropertyRNA *cprop) { + StructRNA *srna; + FunctionRNA *func; + PropertyRNA *parm; + RNA_def_property_srna(cprop, "MainWorlds"); + srna= RNA_def_struct(brna, "MainWorlds", NULL); + RNA_def_struct_ui_text(srna, "Main Worlds", "Collection of worlds"); + + func= RNA_def_function(srna, "new", "rna_Main_worlds_new"); + RNA_def_function_ui_description(func, "Add a new world to the main database"); + parm= RNA_def_string(func, "name", "World", 0, "", "New name for the datablock."); + RNA_def_property_flag(parm, PROP_REQUIRED); + /* return type */ + parm= RNA_def_pointer(func, "world", "World", "", "New world datablock."); + RNA_def_function_return(func, parm); + + func= RNA_def_function(srna, "remove", "rna_Main_worlds_remove"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + RNA_def_function_ui_description(func, "Remove a world from the current blendfile."); + parm= RNA_def_pointer(func, "world", "World", "", "World to remove."); + RNA_def_property_flag(parm, PROP_REQUIRED); } + void RNA_def_main_groups(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; @@ -850,7 +989,27 @@ void RNA_def_main_actions(BlenderRNA *brna, PropertyRNA *cprop) } void RNA_def_main_particles(BlenderRNA *brna, PropertyRNA *cprop) { + StructRNA *srna; + FunctionRNA *func; + PropertyRNA *parm; + RNA_def_property_srna(cprop, "MainParticles"); + srna= RNA_def_struct(brna, "MainParticles", NULL); + RNA_def_struct_ui_text(srna, "Main Particle Settings", "Collection of particle settings"); + + func= RNA_def_function(srna, "new", "rna_Main_particles_new"); + RNA_def_function_ui_description(func, "Add a new particle settings instance to the main database"); + parm= RNA_def_string(func, "name", "ParticleSettings", 0, "", "New name for the datablock."); + RNA_def_property_flag(parm, PROP_REQUIRED); + /* return type */ + parm= RNA_def_pointer(func, "particle", "ParticleSettings", "", "New particle settings datablock."); + RNA_def_function_return(func, parm); + + func= RNA_def_function(srna, "remove", "rna_Main_particles_remove"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + RNA_def_function_ui_description(func, "Remove a particle settings instance from the current blendfile."); + parm= RNA_def_pointer(func, "particle", "ParticleSettings", "", "Particle Settings to remove."); + RNA_def_property_flag(parm, PROP_REQUIRED); } void RNA_def_main_gpencil(BlenderRNA *brna, PropertyRNA *cprop) {