Revision: 27162
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27162
Author: aligorith
Date: 2010-02-27 03:03:33 +0100 (Sat, 27 Feb 2010)
Log Message:
-----------
* Renaming some Keying Sets API functions to make the terminology more
consistent in the UI
* Fixed bug with hotkeys for adding properties to Keying Sets using the KKEY
over the relevant buttons. Was calling the remove callback instead.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_animsys.h
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/editors/animation/keyingsets.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/makesrna/intern/rna_animation.c
trunk/blender/source/blender/makesrna/intern/rna_animation_api.c
Modified: trunk/blender/source/blender/blenkernel/BKE_animsys.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_animsys.h 2010-02-27
01:47:46 UTC (rev 27161)
+++ trunk/blender/source/blender/blenkernel/BKE_animsys.h 2010-02-27
02:03:33 UTC (rev 27162)
@@ -70,11 +70,11 @@
/* Used to create a new 'custom' KeyingSet for the user, that will be
automatically added to the stack */
struct KeyingSet *BKE_keyingset_add(struct ListBase *list, const char name[],
short flag, short keyingflag);
-/* Add a destination to a KeyingSet */
-void BKE_keyingset_add_destination(struct KeyingSet *ks, struct ID *id, const
char group_name[], const char rna_path[], int array_index, short flag, short
groupmode);
+/* Add a path to a KeyingSet */
+void BKE_keyingset_add_path(struct KeyingSet *ks, struct ID *id, const char
group_name[], const char rna_path[], int array_index, short flag, short
groupmode);
/* Find the destination matching the criteria given */
-struct KS_Path *BKE_keyingset_find_destination(struct KeyingSet *ks, struct ID
*id, const char group_name[], const char rna_path[], int array_index, int
group_mode);
+struct KS_Path *BKE_keyingset_find_path(struct KeyingSet *ks, struct ID *id,
const char group_name[], const char rna_path[], int array_index, int
group_mode);
/* Copy all KeyingSets in the given list */
void BKE_keyingsets_copy(struct ListBase *newlist, struct ListBase *list);
Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2010-02-27
01:47:46 UTC (rev 27161)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2010-02-27
02:03:33 UTC (rev 27162)
@@ -547,7 +547,7 @@
/* Find the first path that matches the given criteria */
// TODO: do we want some method to perform partial matches too?
-KS_Path *BKE_keyingset_find_destination (KeyingSet *ks, ID *id, const char
group_name[], const char rna_path[], int array_index, int group_mode)
+KS_Path *BKE_keyingset_find_path (KeyingSet *ks, ID *id, const char
group_name[], const char rna_path[], int array_index, int group_mode)
{
KS_Path *ksp;
@@ -624,7 +624,7 @@
/* Add a destination to a KeyingSet. Nothing is returned for now...
* Checks are performed to ensure that destination is appropriate for the
KeyingSet in question
*/
-void BKE_keyingset_add_destination (KeyingSet *ks, ID *id, const char
group_name[], const char rna_path[], int array_index, short flag, short
groupmode)
+void BKE_keyingset_add_path (KeyingSet *ks, ID *id, const char group_name[],
const char rna_path[], int array_index, short flag, short groupmode)
{
KS_Path *ksp;
@@ -643,7 +643,7 @@
}
/* don't add if there is already a matching KS_Path in the KeyingSet */
- if (BKE_keyingset_find_destination(ks, id, group_name, rna_path,
array_index, groupmode)) {
+ if (BKE_keyingset_find_path(ks, id, group_name, rna_path, array_index,
groupmode)) {
if (G.f & G_DEBUG)
printf("ERROR: destination already exists in Keying Set
\n");
return;
Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c 2010-02-27
01:47:46 UTC (rev 27161)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c 2010-02-27
02:03:33 UTC (rev 27162)
@@ -831,7 +831,7 @@
driver->flag |= DRIVER_FLAG_INVALID;
return 0.0f;
}
-
+
/* get RNA-pointer for the ID-block given in target */
RNA_id_pointer_create(id, &id_ptr);
@@ -887,7 +887,7 @@
/* check if the ID here is a valid object */
if (id && GS(id->name)) {
Object *ob= (Object *)id;
-
+
/* get pose, and subsequently, posechannel */
return get_pose_channel(ob->pose, dtar->pchan_name);
}
Modified: trunk/blender/source/blender/editors/animation/keyingsets.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyingsets.c 2010-02-27
01:47:46 UTC (rev 27161)
+++ trunk/blender/source/blender/editors/animation/keyingsets.c 2010-02-27
02:03:33 UTC (rev 27162)
@@ -355,7 +355,7 @@
}
/* add path to this setting */
- BKE_keyingset_add_destination(ks, ptr.id.data, NULL,
path, index, pflag, KSP_GROUP_KSNAME);
+ BKE_keyingset_add_path(ks, ptr.id.data, NULL, path,
index, pflag, KSP_GROUP_KSNAME);
ks->active_path= BLI_countlist(&ks->paths);
success= 1;
@@ -426,7 +426,7 @@
KS_Path *ksp;
/* try to find a path matching this description */
- ksp= BKE_keyingset_find_destination(ks, ptr.id.data,
ks->name, path, index, KSP_GROUP_KSNAME);
+ ksp= BKE_keyingset_find_path(ks, ptr.id.data, ks->name,
path, index, KSP_GROUP_KSNAME);
if (ksp) {
/* just free it... */
@@ -1162,33 +1162,15 @@
return templates;
}
-/* Check if context data is suitable for the given absolute Keying Set */
+/* Check if context data is suitable for the given Keying Set */
short keyingset_context_ok_poll (bContext *C, KeyingSet *ks)
{
- ScrArea *sa= CTX_wm_area(C);
+ // TODO:
+ // For 'relative' keyingsets (i.e. py-keyingsets), add a call here
+ // which basically gets a listing of all the paths to be used for
this
+ // set.
- /* data retrieved from context depends on active editor */
- if (sa == NULL) return 0;
-
- switch (sa->spacetype) {
- case SPACE_VIEW3D:
- {
- Object *obact= CTX_data_active_object(C);
-
- /* if in posemode, check if 'pose-channels' requested
for in KeyingSet */
- if ((obact && obact->pose) && (obact->mode &
OB_MODE_POSE)) {
- /* check for posechannels */
-
- }
- else {
- /* check for selected object */
-
- }
- }
- break;
- }
-
return 1;
}
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2010-02-27 01:47:46 UTC (rev 27161)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2010-02-27 02:03:33 UTC (rev 27162)
@@ -4015,7 +4015,7 @@
if(event->alt)
ui_but_anim_remove_keyingset(C);
else
- ui_but_anim_remove_keyingset(C);
+ ui_but_anim_add_keyingset(C);
ED_region_tag_redraw(CTX_wm_region(C));
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c
2010-02-27 01:47:46 UTC (rev 27161)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c
2010-02-27 02:03:33 UTC (rev 27162)
@@ -3977,14 +3977,14 @@
{
/* add a new path with the
information obtained (only if valid) */
// TODO: what do we do with
group name? for now, we don't supply one, and just let this use the KeyingSet
name
-
BKE_keyingset_add_destination(ks, id, NULL, path, array_index, flag, groupmode);
+ BKE_keyingset_add_path(ks, id,
NULL, path, array_index, flag, groupmode);
ks->active_path=
BLI_countlist(&ks->paths);
}
break;
case KEYINGSET_EDITMODE_REMOVE:
{
/* find the relevant path, then
remove it from the KeyingSet */
- KS_Path *ksp=
BKE_keyingset_find_destination(ks, id, NULL, path, array_index, groupmode);
+ KS_Path *ksp=
BKE_keyingset_find_path(ks, id, NULL, path, array_index, groupmode);
if (ksp) {
/* free path's data */
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2010-02-27 01:47:46 UTC (rev 27161)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2010-02-27 02:03:33 UTC (rev 27162)
@@ -4718,7 +4718,7 @@
Object *ob;
// short redrawipo=0, resetslowpar=1;
int cancelled= (t->state == TRANS_CANCEL);
- short duplicate= (t->undostr && strstr(t->undostr, "Duplicate")) ? 1 :
0;
+ short duplicate= (t->undostr && strstr(t->undostr, "Duplicate")) ? 1 :
0; /* see bugreport #21229 for reasons for this data */
/* early out when nothing happened */
if (t->total == 0 || t->mode == TFM_DUMMY)
Modified: trunk/blender/source/blender/makesrna/intern/rna_animation.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animation.c
2010-02-27 01:47:46 UTC (rev 27161)
+++ trunk/blender/source/blender/makesrna/intern/rna_animation.c
2010-02-27 02:03:33 UTC (rev 27162)
@@ -249,6 +249,7 @@
RNA_def_property_ui_text(prop, "Active Path Index", "Current Keying Set
index");
/* Flags */
+ // XXX: depreceated
prop= RNA_def_property(srna, "builtin", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", KEYINGSET_BUILTIN);
Modified: trunk/blender/source/blender/makesrna/intern/rna_animation_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animation_api.c
2010-02-27 01:47:46 UTC (rev 27161)
+++ trunk/blender/source/blender/makesrna/intern/rna_animation_api.c
2010-02-27 02:03:33 UTC (rev 27162)
@@ -41,7 +41,7 @@
#include "BKE_animsys.h"
-static void rna_KeyingSet_add_destination(KeyingSet *keyingset, ReportList
*reports,
+static void rna_KeyingSet_add_path(KeyingSet *keyingset, ReportList *reports,
ID *id, char rna_path[], int array_index, int entire_array,
int grouping_method, char group_name[])
{
@@ -53,11 +53,11 @@
/* if data is valid, call the API function for this */
if (keyingset) {
- BKE_keyingset_add_destination(keyingset, id, group_name,
rna_path, array_index, flag, grouping_method);
+ BKE_keyingset_add_path(keyingset, id, group_name, rna_path,
array_index, flag, grouping_method);
keyingset->active_path= BLI_countlist(&keyingset->paths);
}
else {
- BKE_report(reports, RPT_ERROR, "Keying Set Destination could
not be added.");
+ BKE_report(reports, RPT_ERROR, "Keying Set Path could not be
added.");
}
}
@@ -69,7 +69,7 @@
PropertyRNA *parm;
/* Add Destination */
- func= RNA_def_function(srna, "add_destination",
"rna_KeyingSet_add_destination");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
