diff options
| -rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sequence.c | 2 | ||||
| -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 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna.c | 2 |
6 files changed, 16 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index c451168a005..e90fccf6b29 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -731,6 +731,9 @@ DriverTarget *driver_add_new_target (ChannelDriver *driver) dtar= MEM_callocN(sizeof(DriverTarget), "DriverTarget"); BLI_addtail(&driver->targets, dtar); + /* make the default ID-type ID_OB, since most driver targets refer to objects */ + dtar->idtype= ID_OB; + /* give the target a 'unique' name */ strcpy(dtar->name, "var"); BLI_uniquename(&driver->targets, dtar, "var", '_', offsetof(DriverTarget, name), 64); diff --git a/source/blender/blenkernel/intern/sequence.c b/source/blender/blenkernel/intern/sequence.c index 07969704521..1920e82b4ab 100644 --- a/source/blender/blenkernel/intern/sequence.c +++ b/source/blender/blenkernel/intern/sequence.c @@ -2007,7 +2007,7 @@ static void do_build_seq_ibuf(Scene *scene, Sequence * seq, TStripElem *se, int } } } else if(seq->type == SEQ_SCENE) { // scene can be NULL after deletions - Scene *sce= seq->scene, *oldsce= scene; + Scene *sce= seq->scene;// *oldsce= scene; Render *re; RenderResult rres; char scenename[64]; 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 +} + diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 1693268a19c..56981e0fe0a 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1473,7 +1473,7 @@ static PyObject *pyrna_struct_path_to_id(BPy_StructRNA *self, PyObject *args) static PyObject *pyrna_prop_path_to_id(BPy_PropertyRNA *self) { char *path; - PropertyRNA *prop; + PropertyRNA *prop = self->prop; PyObject *ret; path= RNA_path_from_ID_to_property(&self->ptr, self->prop); |