Revision: 19654
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19654
Author: aligorith
Date: 2009-04-11 08:48:39 +0200 (Sat, 11 Apr 2009)
Log Message:
-----------
Drivers: Errors + UI Tweaks
* Invalid drivers are now tagged accordingly and are not evaluated until they
are manually refreshed using the 'Update Dependencies' button
* Drivers with errors have a error warning shown in their UI
* Rearranged the UI buttons a bit for drivers, adding support for a 'remove'
driver button.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-04-11 05:46:40 UTC (rev 19653)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-04-11 06:48:39 UTC (rev 19654)
@@ -419,21 +419,25 @@
}
/* Simple replacement based data-setting of the FCurve using RNA */
-static void animsys_execute_fcurve (PointerRNA *ptr, AnimMapper *remap, FCurve
*fcu)
+static short animsys_execute_fcurve (PointerRNA *ptr, AnimMapper *remap,
FCurve *fcu)
{
char *path = NULL;
short free_path=0;
+ short ok= 0;
/* get path, remapped as appropriate to work in its new environment */
free_path= animsys_remap_path(remap, fcu->rna_path, &path);
/* write value to setting */
if (path)
- animsys_write_rna_setting(ptr, path, fcu->array_index,
fcu->curval);
+ ok= animsys_write_rna_setting(ptr, path, fcu->array_index,
fcu->curval);
/* free temp path-info */
if (free_path)
MEM_freeN(path);
+
+ /* return whether we were successful */
+ return ok;
}
/* Evaluate all the F-Curves in the given list
@@ -469,20 +473,25 @@
for (fcu= adt->drivers.first; fcu; fcu= fcu->next)
{
ChannelDriver *driver= fcu->driver;
+ short ok= 0;
/* check if this driver's curve should be skipped */
// FIXME: maybe we shouldn't check for muted, though that would
make things more confusing, as there's already too many ways to disable?
if ((fcu->flag & (FCURVE_MUTED|FCURVE_DISABLED)) == 0)
{
/* check if driver itself is tagged for recalculation */
- if ((driver) /*&& (driver->flag &
DRIVER_FLAG_RECALC)*/) { // XXX driver recalc flag is not set yet by
depsgraph!
+ if ((driver) && !(driver->flag &
DRIVER_FLAG_INVALID)/*&& (driver->flag & DRIVER_FLAG_RECALC)*/) { // XXX
driver recalc flag is not set yet by depsgraph!
/* evaluate this using values set already in
other places */
// NOTE: for 'layering' option later on, we
should check if we should remove old value before adding new to only be done
when drivers only changed
calculate_fcurve(fcu, ctime);
- animsys_execute_fcurve(ptr, NULL, fcu);
+ ok= animsys_execute_fcurve(ptr, NULL, fcu);
/* clear recalc flag */
driver->flag &= ~DRIVER_FLAG_RECALC;
+
+ /* set error-flag if evaluation failed */
+ if (ok == 0)
+ driver->flag |= DRIVER_FLAG_INVALID;
}
}
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
2009-04-11 05:46:40 UTC (rev 19653)
+++
branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
2009-04-11 06:48:39 UTC (rev 19654)
@@ -170,6 +170,31 @@
driver->rna_path= BLI_strdupn(stringBuf, strlen(stringBuf));
}
+/* callback to remove the active driver */
+static void driver_remove_cb (bContext *C, void *ale_v, void *dummy_v)
+{
+ bAnimListElem *ale= (bAnimListElem *)ale_v;
+ ID *id= ale->id;
+ FCurve *fcu= ale->data;
+
+ /* try to get F-Curve that driver lives on, and ID block which has this
AnimData */
+ if (ELEM(NULL, id, fcu))
+ return;
+
+ /* call API method to remove this driver */
+ ANIM_remove_driver(id, fcu->rna_path, fcu->array_index, 0);
+}
+
+/* callback to reset the driver's flags */
+static void driver_update_flags_cb (bContext *C, void *fcu_v, void *dummy_v)
+{
+ FCurve *fcu= (FCurve *)fcu_v;
+ ChannelDriver *driver= fcu->driver;
+
+ /* clear invalid flags */
+ driver->flag &= ~DRIVER_FLAG_INVALID;
+}
+
static void graph_panel_drivers(const bContext *C, ARegion *ar, short cntrl,
bAnimListElem *ale)
{
FCurve *fcu= (FCurve *)ale->data;
@@ -184,27 +209,34 @@
/* to force height */
uiNewPanelHeight(block, 204);
+ /* general actions */
+ but= uiDefBut(block, BUT, B_IPO_DEPCHANGE, "Update Dependencies", 10,
200, 180, 22, NULL, 0.0, 0.0, 0, 0, "Force updates of dependencies");
+ uiButSetFunc(but, driver_update_flags_cb, fcu, NULL);
+
+ but= uiDefBut(block, BUT, B_IPO_DEPCHANGE, "Remove Driver", 200, 200,
110, 18, NULL, 0.0, 0.0, 0, 0, "Remove this driver");
+ uiButSetFunc(but, driver_remove_cb, ale, NULL);
+
/* type */
- uiDefBut(block, LABEL, 1, "Type:",
10, 200, 120, 20, NULL, 0.0, 0.0, 0, 0, "");
+ uiDefBut(block, LABEL, 1, "Type:",
10, 170, 60, 20, NULL, 0.0, 0.0, 0, 0, "");
uiDefButI(block, MENU, B_IPO_DEPCHANGE,
"Driver Type%t|Transform
Channel%x0|Scripted Expression%x1|Rotational Difference%x2",
- 130,200,180,20, &driver->type, 0, 0, 0,
0, "Driver type");
- uiDefBut(block, BUT, B_IPO_DEPCHANGE, "Update Dependencies", 10, 180,
300, 20, NULL, 0.0, 0.0, 0, 0, "Force updates of dependencies");
+ 70,170,230,20, &driver->type, 0, 0, 0,
0, "Driver type");
/* buttons to draw depends on type of driver */
if (driver->type == DRIVER_TYPE_PYTHON) { /* PyDriver */
- uiDefBut(block, TEX, B_REDR, "Expr: ", 10,150,300,20,
driver->expression, 0, 255, 0, 0, "One-liner Python Expression to use as
Scripted Expression");
+ uiDefBut(block, TEX, B_REDR, "Expr: ", 10,130,300,20,
driver->expression, 0, 255, 0, 0, "One-liner Python Expression to use as
Scripted Expression");
+ /* errors */
if (driver->flag & DRIVER_FLAG_INVALID) {
- uiDefIconBut(block, LABEL, 1, ICON_ERROR, 10, 130, 20,
19, NULL, 0, 0, 0, 0, "");
+ uiDefIconBut(block, LABEL, 1, ICON_ERROR, 10, 110, 32,
32, NULL, 0, 0, 0, 0, ""); // a bit larger
uiDefBut(block, LABEL, 0, "Error: invalid Python
expression",
- 30,130,230,19, NULL, 0, 0, 0, 0, "");
+ 30,110,230,19, NULL, 0, 0, 0, 0, "");
}
}
else { /* Channel or RotDiff - RotDiff just has extra settings */
/* Driver Object */
uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_REDR,
- "Ob: ", 10, 150, 150, 20, &driver->id,
"Object to use as Driver target");
+ "Ob: ", 10, 130, 150, 20, &driver->id,
"Object to use as Driver target");
// XXX should we hide these technical details?
if (driver->id) {
@@ -212,7 +244,7 @@
/* Array Index */
// XXX ideally this is grouped with the path, but that
can get quite long...
- uiDefButI(block, NUM, B_REDR, "Index: ",
170,150,140,20, &driver->array_index, 0, INT_MAX, 0, 0, "Index to the specific
property used as Driver if applicable.");
+ uiDefButI(block, NUM, B_REDR, "Index: ",
170,130,140,20, &driver->array_index, 0, INT_MAX, 0, 0, "Index to the specific
property used as Driver if applicable.");
/* RNA Path */
if (driver->rna_path == NULL)
@@ -220,7 +252,7 @@
else
BLI_snprintf(pathBuf, 512, driver->rna_path);
- but= uiDefButC(block, TEX, B_REDR, "Path: ",
10,120,300,20, pathBuf, 0, 511, 0, 0, "RNA Path (from Driver Object) to
property used as Driver.");
+ but= uiDefButC(block, TEX, B_REDR, "Path: ",
10,100,300,20, pathBuf, 0, 511, 0, 0, "RNA Path (from Driver Object) to
property used as Driver.");
uiButSetFunc(but, driver_rnapath_copy_cb, driver,
pathBuf);
}
@@ -228,6 +260,13 @@
if (driver->type == DRIVER_TYPE_ROTDIFF) {
// TODO...
}
+
+ /* errors */
+ if (driver->flag & DRIVER_FLAG_INVALID) {
+ uiDefIconBut(block, LABEL, 1, ICON_ERROR, 10, 70, 32,
32, NULL, 0, 0, 0, 0, ""); // a bit larger
+ uiDefBut(block, LABEL, 0, "Error: invalid target
channel",
+ 30,70,230,19, NULL, 0, 0, 0, 0, "");
+ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
