diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-07-27 19:12:02 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-07-27 19:12:02 +0300 |
| commit | 48759580839aa4e2ad2541ff4c19baaaf751721d (patch) | |
| tree | bdf4ba780f898023762f24d9327b757f27f3ff8e /source | |
| parent | bdbc6fafc038afdffdb4d040ea692f15f31a0048 (diff) | |
Cleanup: Remove occurances of GPULamp
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 1 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 33ea13c9a38..1d6b23ce7f7 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1204,7 +1204,6 @@ void BKE_object_copy_data(Main *bmain, Object *ob_dst, const Object *ob_src, con ob_dst->derivedDeform = NULL; ob_dst->derivedFinal = NULL; - BLI_listbase_clear(&ob_dst->gpulamp); BLI_listbase_clear((ListBase *)&ob_dst->drawdata); BLI_listbase_clear(&ob_dst->pc_ids); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index d76a2fc2cd0..f226693b989 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5545,7 +5545,6 @@ static void direct_link_object(FileData *fd, Object *ob) ob->derivedDeform = NULL; ob->derivedFinal = NULL; BKE_object_runtime_reset(ob); - BLI_listbase_clear(&ob->gpulamp); link_list(fd, &ob->pc_ids); /* Runtime curve data */ diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index f2c029f643e..9fea9eaf4e1 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -55,7 +55,6 @@ struct GPUNodeStack; struct GPUMaterial; struct GPUTexture; struct GPUUniformBuffer; -struct GPULamp; struct PreviewImage; struct World; struct bNode; diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 999ebe0ccc3..edc87c492a6 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -283,7 +283,6 @@ typedef struct Object { /* Runtime valuated curve-specific data, not stored in the file */ struct CurveCache *curve_cache; - ListBase gpulamp; /* runtime, for glsl lamp display only */ ListBase pc_ids; struct RigidBodyOb *rigidbody_object; /* settings for Bullet rigid body */ |