diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-11-25 12:25:58 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-11-25 12:25:58 +0300 |
| commit | 802779eb2d266f6a1de717fe9e7dcadc9774a7d3 (patch) | |
| tree | db1ebf873356493808fe52ba6a9c91a01b8e36aa /source/blender/editors | |
| parent | ce4b63aa3f4f892703e6223a2546e067b446a98c (diff) | |
Assorted fixes - compile + drivers:
* Fixed a few compile warnings for scons+mingw
* Driver variables are now added with the ID-type set to ID_OB (objects) by default since this is more convenient
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/animation/drivers.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_draw.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index e731faaf103..d7d3c21607f 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -53,6 +53,7 @@ #include "BKE_animsys.h" #include "BKE_action.h" #include "BKE_constraint.h" +#include "BKE_depsgraph.h" #include "BKE_fcurve.h" #include "BKE_utildefines.h" #include "BKE_context.h" @@ -175,14 +176,17 @@ short ANIM_add_driver (ID *id, const char rna_path[], int array_index, short fla fcu= verify_driver_fcurve(id, rna_path, array_index, 1); if (fcu && fcu->driver) { - fcu->driver->type= type; + ChannelDriver *driver= fcu->driver; + + /* set the type of the driver */ + driver->type= type; /* fill in current value for python */ if (type == DRIVER_TYPE_PYTHON) { PropertyType proptype= RNA_property_type(prop); int array= RNA_property_array_length(&ptr, prop); - char *expression= fcu->driver->expression; - int val, maxlen= sizeof(fcu->driver->expression); + char *expression= driver->expression; + int val, maxlen= sizeof(driver->expression); float fval; if (proptype == PROP_BOOLEAN) { diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 92bbd1c6573..762ec541bff 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -468,8 +468,8 @@ void ui_draw_but_IMAGE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *rect extern char datatoc_splash_png[]; extern int datatoc_splash_png_size; ImBuf *ibuf; - GLint scissor[4]; - int w, h; + //GLint scissor[4]; + //int w, h; /* hardcoded to splash, loading and freeing every draw, eek! */ ibuf= IMB_ibImageFromMemory((int *)datatoc_splash_png, datatoc_splash_png_size, IB_rect); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 99bfea38c49..d9c21a9c9a5 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -1786,4 +1786,5 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot) /* properties */ prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, "Group", "Vertex group to set as active."); RNA_def_enum_funcs(prop, vgroup_itemf); -}
\ No newline at end of file +} + |