diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-01-13 01:54:30 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-01-13 01:54:30 +0300 |
| commit | ae25863d6cb859ff8d18db41960ba3a0ff2dc8f1 (patch) | |
| tree | 28ff01dd1298bc823e6d1c91d50936e2c293ebc2 /source/blender/blenkernel | |
| parent | ab39a3f2b79a037efecac11ebcd94868a16a67ef (diff) | |
2.5
* Tweaked a few incorrect comments in Constraints code
* Made Sequencer use View2D system correctly (only looked at the 'time-grid' thing so far).
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_constraint.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h index 8fe71673a98..043062a2871 100644 --- a/source/blender/blenkernel/BKE_constraint.h +++ b/source/blender/blenkernel/BKE_constraint.h @@ -79,7 +79,7 @@ typedef struct bConstraintTypeInfo { void (*relink_data)(struct bConstraint *con); /* copy any special data that is allocated separately (optional) */ void (*copy_data)(struct bConstraint *con, struct bConstraint *src); - /* set settings for data that will be used for bConstraint.data (memory already allocated) */ + /* set settings for data that will be used for bConstraint.data (memory already allocated using MEM_callocN) */ void (*new_data)(void *cdata); /* target handling function pointers */ diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 52448fca8d6..f83428766f9 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -3389,7 +3389,7 @@ void copy_constraints (ListBase *dst, ListBase *src) dst->first= dst->last= NULL; BLI_duplicatelist(dst, src); - for (con=dst->first, srccon=src->first; con; srccon=srccon->next, con=con->next) { + for (con=dst->first, srccon=src->first; con && srccon; srccon=srccon->next, con=con->next) { bConstraintTypeInfo *cti= constraint_get_typeinfo(con); /* make a new copy of the constraint's data */ |