From 44eb9f509552162d776c1b39a0689d8ddac8f1c7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 30 Aug 2010 14:33:46 +0000 Subject: [PATCH] missed this one too scene.add_keying_set() --> scene.keying_sets.new() also removed the use_ prefix since argument names, since this is mainly for properties. --- release/scripts/presets/interaction/maya.py | 2 +- release/scripts/ui/properties_scene.py | 2 +- source/blender/makesrna/intern/rna_scene.c | 58 ++++++++++++++----- .../blender/makesrna/intern/rna_scene_api.c | 42 -------------- 4 files changed, 45 insertions(+), 59 deletions(-) diff --git a/release/scripts/presets/interaction/maya.py b/release/scripts/presets/interaction/maya.py index 6c8d09f7b81..0f95616527d 100644 --- a/release/scripts/presets/interaction/maya.py +++ b/release/scripts/presets/interaction/maya.py @@ -197,7 +197,7 @@ kmi = km.items.new('transform.create_orientation', 'SPACE', 'PRESS', ctrl=True, kmi.properties.use = True kmi = km.items.new('transform.mirror', 'M', 'PRESS', ctrl=True) kmi = km.items.new('wm.context_toggle', 'TAB', 'PRESS', shift=True) -kmi.properties.data_path = 'tool_settings.snap' +kmi.properties.data_path = 'tool_settings.use_snap' kmi = km.items.new('transform.snap_type', 'TAB', 'PRESS', shift=True, ctrl=True) kmi = km.items.new('view3d.enable_manipulator', 'W', 'PRESS') kmi.properties.translate = True diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/ui/properties_scene.py index f5cf54fa315..a26b09f0692 100644 --- a/release/scripts/ui/properties_scene.py +++ b/release/scripts/ui/properties_scene.py @@ -238,7 +238,7 @@ class ANIM_OT_keying_set_export(bpy.types.Operator): # Add KeyingSet and set general settings f.write("# Keying Set Level declarations\n") - f.write("ks= scene.add_keying_set(name=\"%s\")\n" % ks.name) + f.write("ks= scene.keying_sets.new(name=\"%s\")\n" % ks.name) if not ks.is_path_absolute: f.write("ks.is_path_absolute = False\n") diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index c21c6fb4aba..7ccef4ba031 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -164,6 +164,7 @@ EnumPropertyItem image_type_items[] = { #include "BKE_mesh.h" #include "BKE_sound.h" #include "BKE_screen.h" +#include "BKE_animsys.h" #include "BLI_threads.h" #include "BLI_editVert.h" @@ -938,6 +939,33 @@ static void rna_TimeLine_remove(Scene *scene, ReportList *reports, TimeMarker *m MEM_freeN(marker); } +static KeyingSet *rna_Scene_keying_set_new(Scene *sce, ReportList *reports, + char name[], int absolute, int insertkey_needed, int insertkey_visual) +{ + KeyingSet *ks= NULL; + short flag=0, keyingflag=0; + + /* validate flags */ + if (absolute) + flag |= KEYINGSET_ABSOLUTE; + if (insertkey_needed) + keyingflag |= INSERTKEY_NEEDED; + if (insertkey_visual) + keyingflag |= INSERTKEY_MATRIX; + + /* call the API func, and set the active keyingset index */ + ks= BKE_keyingset_add(&sce->keyingsets, name, flag, keyingflag); + + if (ks) { + sce->active_keyingset= BLI_countlist(&sce->keyingsets); + return ks; + } + else { + BKE_report(reports, RPT_ERROR, "Keying Set could not be added."); + return NULL; + } +} + #else static void rna_def_transform_orientation(BlenderRNA *brna) @@ -2954,28 +2982,28 @@ static void rna_def_scene_keying_sets(BlenderRNA *brna, PropertyRNA *cprop) StructRNA *srna; PropertyRNA *prop; -// FunctionRNA *func; -// PropertyRNA *parm; + FunctionRNA *func; + PropertyRNA *parm; RNA_def_property_srna(cprop, "KeyingSets"); srna= RNA_def_struct(brna, "KeyingSets", NULL); RNA_def_struct_sdna(srna, "Scene"); RNA_def_struct_ui_text(srna, "Keying Sets", "Scene keying sets"); - /* - func= RNA_def_function(srna, "new", "rna_Curve_spline_new"); - RNA_def_function_ui_description(func, "Add a new spline to the curve."); - parm= RNA_def_enum(func, "type", curve_type_items, CU_POLY, "", "type for the new spline."); - RNA_def_property_flag(parm, PROP_REQUIRED); - parm= RNA_def_pointer(func, "spline", "Spline", "", "The newly created spline."); - RNA_def_function_return(func, parm); - - func= RNA_def_function(srna, "remove", "rna_Curve_spline_remove"); - RNA_def_function_ui_description(func, "Remove a spline from a curve."); + /* Add Keying Set */ + func= RNA_def_function(srna, "new", "rna_Scene_keying_set_new"); + RNA_def_function_ui_description(func, "Add a new Keying Set to Scene."); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm= RNA_def_pointer(func, "spline", "Spline", "", "The spline to remove."); - RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); - */ + /* returns the new KeyingSet */ + parm= RNA_def_pointer(func, "keyingset", "KeyingSet", "", "Newly created Keying Set."); + RNA_def_function_return(func, parm); + /* name */ + RNA_def_string(func, "name", "KeyingSet", 64, "Name", "Name of Keying Set"); + /* flags */ + RNA_def_boolean(func, "absolute", 1, "Absolute", "Keying Set defines specific paths/settings to be keyframed (i.e. is not reliant on context info)"); + /* keying flags */ + RNA_def_boolean(func, "insertkey_needed", 0, "Insert Keyframes - Only Needed", "Only insert keyframes where they're needed in the relevant F-Curves."); + RNA_def_boolean(func, "insertkey_visual", 0, "Insert Keyframes - Visual", "Insert keyframes based on 'visual transforms'."); prop= RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "KeyingSet"); diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 498bd148508..04fbae894d0 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -63,33 +63,6 @@ static void rna_Scene_update_tagged(Scene *scene) scene_update_tagged(G.main, scene); } -static KeyingSet *rna_Scene_add_keying_set(Scene *sce, ReportList *reports, - char name[], int absolute, int insertkey_needed, int insertkey_visual) -{ - KeyingSet *ks= NULL; - short flag=0, keyingflag=0; - - /* validate flags */ - if (absolute) - flag |= KEYINGSET_ABSOLUTE; - if (insertkey_needed) - keyingflag |= INSERTKEY_NEEDED; - if (insertkey_visual) - keyingflag |= INSERTKEY_MATRIX; - - /* call the API func, and set the active keyingset index */ - ks= BKE_keyingset_add(&sce->keyingsets, name, flag, keyingflag); - - if (ks) { - sce->active_keyingset= BLI_countlist(&sce->keyingsets); - return ks; - } - else { - BKE_report(reports, RPT_ERROR, "Keying Set could not be added."); - return NULL; - } -} - static void rna_SceneRender_get_frame_path(RenderData *rd, int frame, char *name) { if(BKE_imtype_is_movie(rd->imtype)) @@ -113,21 +86,6 @@ void RNA_api_scene(StructRNA *srna) func= RNA_def_function(srna, "update", "rna_Scene_update_tagged"); RNA_def_function_ui_description(func, "Update data tagged to be updated from previous access to data or operators."); - - /* Add Keying Set */ - func= RNA_def_function(srna, "add_keying_set", "rna_Scene_add_keying_set"); - RNA_def_function_ui_description(func, "Add a new Keying Set to Scene."); - RNA_def_function_flag(func, FUNC_USE_REPORTS); - /* returns the new KeyingSet */ - parm= RNA_def_pointer(func, "keyingset", "KeyingSet", "", "Newly created Keying Set."); - RNA_def_function_return(func, parm); - /* name */ - RNA_def_string(func, "name", "KeyingSet", 64, "Name", "Name of Keying Set"); - /* flags */ - RNA_def_boolean(func, "absolute", 1, "Absolute", "Keying Set defines specific paths/settings to be keyframed (i.e. is not reliant on context info)"); - /* keying flags */ - RNA_def_boolean(func, "use_insertkey_needed", 0, "Insert Keyframes - Only Needed", "Only insert keyframes where they're needed in the relevant F-Curves."); - RNA_def_boolean(func, "use_insertkey_visual", 0, "Insert Keyframes - Visual", "Insert keyframes based on 'visual transforms'."); } void RNA_api_scene_render(StructRNA *srna)