diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-29 19:46:14 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-29 19:46:14 +0400 |
| commit | 16702c172939a399ddd0e61fc14a8b0944c4249b (patch) | |
| tree | 130c9c0e6f62af167309f22f720a4f7deacd8f2d /source/blender/blenkernel/intern/linestyle.c | |
| parent | f0ca79bccb5e8290d02318b81aebdeb713180886 (diff) | |
| parent | f1cea89d99f0c80bdccd2ba1359142b5ff14cdb9 (diff) | |
Merged changes in the trunk up to revision 41225.
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
Diffstat (limited to 'source/blender/blenkernel/intern/linestyle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/linestyle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index faf4b11f489..177cc64aa40 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -130,7 +130,7 @@ static LineStyleModifier *new_modifier(int type, size_t size) static void add_to_modifier_list(ListBase *lb, LineStyleModifier *m) { BLI_addtail(lb, (void *)m); - BLI_uniquename(lb, m, modifier_name[m->type], '.', BLI_STRUCT_OFFSET(LineStyleModifier, name), sizeof(m->name)); + BLI_uniquename(lb, m, modifier_name[m->type], '.', offsetof(LineStyleModifier, name), sizeof(m->name)); } int FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type) |