diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-17 14:59:04 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-17 14:59:04 +0300 |
| commit | 955d64cd2bf6f85b3f54295a1b0611d0f9ab7af6 (patch) | |
| tree | 05efee8aca507578597ddc89ca9a4072a3dd4af0 /source/blender/blenkernel/intern/library.c | |
| parent | 4925b5c9a9a81377a2bbe5467ccd378702ef67bb (diff) | |
| parent | e1ce9220d6fd0c1fb78d0fd71b8168425abc1220 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/gpu/GPU_buffers.h
source/blender/physics/intern/BPH_mass_spring.cpp
Diffstat (limited to 'source/blender/blenkernel/intern/library.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 6e7f0468824..4ddbe81af86 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1439,7 +1439,7 @@ void id_clear_lib_data(Main *bmain, ID *id) } if (GS(id->name) == ID_OB) { - Object *object = (Object*)id; + Object *object = (Object *)id; if (object->proxy_from != NULL) { object->proxy_from->proxy = NULL; object->proxy_from->proxy_group = NULL; |