From 7484d5b7433a3bfdf37ef5cd667f6ec23cc589df Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Tue, 28 Dec 2010 11:50:10 +0000 Subject: [PATCH] - Typo fixes - Visual Location Keying Set was still using the old-style flag defines --- .../scripts/keyingsets/keyingsets_builtins.py | 16 ++++++++-------- source/blender/makesrna/intern/rna_animation.c | 4 ++-- source/blender/makesrna/intern/rna_scene.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/release/scripts/keyingsets/keyingsets_builtins.py b/release/scripts/keyingsets/keyingsets_builtins.py index 73b75057299..30b00d969c3 100644 --- a/release/scripts/keyingsets/keyingsets_builtins.py +++ b/release/scripts/keyingsets/keyingsets_builtins.py @@ -60,7 +60,7 @@ class BUILTIN_KSI_LocRot(bpy.types.KeyingSetInfo): # iterator - use callback for selected bones/objects iterator = RKS_ITER_selected_item - # generator - use callback for location + # generator def generate(self, context, ks, data): # location RKS_GEN_location(self, context, ks, data) @@ -77,7 +77,7 @@ class BUILTIN_KSI_LocScale(bpy.types.KeyingSetInfo): # iterator - use callback for selected bones/objects iterator = RKS_ITER_selected_item - # generator - use callback for location + # generator def generate(self, context, ks, data): # location RKS_GEN_location(self, context, ks, data) @@ -94,7 +94,7 @@ class BUILTIN_KSI_LocRotScale(bpy.types.KeyingSetInfo): # iterator - use callback for selected bones/objects iterator = RKS_ITER_selected_item - # generator - use callback for location + # generator def generate(self, context, ks, data): # location RKS_GEN_location(self, context, ks, data) @@ -113,7 +113,7 @@ class BUILTIN_KSI_RotScale(bpy.types.KeyingSetInfo): # iterator - use callback for selected bones/objects iterator = RKS_ITER_selected_item - # generator - use callback for location + # generator def generate(self, context, ks, data): # rotation RKS_GEN_rotation(self, context, ks, data) @@ -126,7 +126,7 @@ class BUILTIN_KSI_RotScale(bpy.types.KeyingSetInfo): class BUILTIN_KSI_VisualLoc(bpy.types.KeyingSetInfo): bl_label = "Visual Location" - insertkey_visual = True + bl_options = {'INSERTKEY_VISUAL'} # poll - use predefined callback for selected bones/objects poll = RKS_POLL_selected_items @@ -149,7 +149,7 @@ class BUILTIN_KSI_VisualRot(bpy.types.KeyingSetInfo): # iterator - use callback for selected bones/objects iterator = RKS_ITER_selected_item - # generator - use callback for location + # generator - use callback for rotation generate = RKS_GEN_rotation # VisualLocRot @@ -164,7 +164,7 @@ class BUILTIN_KSI_VisualLocRot(bpy.types.KeyingSetInfo): # iterator - use callback for selected bones/objects iterator = RKS_ITER_selected_item - # generator - use callback for location + # generator def generate(self, context, ks, data): # location RKS_GEN_location(self, context, ks, data) @@ -185,7 +185,7 @@ class BUILTIN_KSI_Available(bpy.types.KeyingSetInfo): # iterator - use callback for selected bones/objects iterator = RKS_ITER_selected_item - # generator - use callback for location + # generator - use callback for doing this generate = RKS_GEN_available ############################### diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index fbc4593437b..b3af8e6b57d 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -161,7 +161,7 @@ static StructRNA *rna_KeyingSetInfo_register(bContext *C, ReportList *reports, v { KeyingSetInfo dummyksi = {0}; KeyingSetInfo *ksi; - PointerRNA dummyptr; + PointerRNA dummyptr = {0}; int have_function[3]; /* setup dummy type info to store static properties in */ @@ -198,7 +198,7 @@ static StructRNA *rna_KeyingSetInfo_register(bContext *C, ReportList *reports, v ksi->poll= (have_function[0])? RKS_POLL_rna_internal: NULL; ksi->iter= (have_function[1])? RKS_ITER_rna_internal: NULL; ksi->generate= (have_function[2])? RKS_GEN_rna_internal: NULL; - + /* add and register with other info as needed */ ANIM_keyingset_info_register(ksi); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 777ca24e66b..4470c49b50f 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -419,7 +419,7 @@ static int rna_Scene_active_keying_set_index_get(PointerRNA *ptr) } /* get KeyingSet index stuff for list of Keying Sets editing UI - * - value+1 since 0 is reserved for 'none'= + * - value+1 since 0 is reserved for 'none' */ static void rna_Scene_active_keying_set_index_set(PointerRNA *ptr, int value) {