diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-18 17:30:13 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-18 17:30:13 +0300 |
| commit | c9d78b6c434b5b1672ad0e0a2854eb9c1199f379 (patch) | |
| tree | 47647ceb5a78cb951768bb03fbca0322e52fe2b2 /source/blender/gpu/intern/gpu_codegen.c | |
| parent | bc6a75b405c4e0b1e85c9c6ec6646fd2d3f67686 (diff) | |
| parent | 70018eb16e721f9171834afd4bf70dc017af1369 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/gpu/intern/gpu_codegen.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index faf1b907570..de2b94482f4 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -410,6 +410,8 @@ const char *GPU_builtin_name(GPUBuiltin builtin) return "unfparticlevel"; else if (builtin == GPU_PARTICLE_ANG_VELOCITY) return "unfparticleangvel"; + else if (builtin == GPU_OBJECT_INFO) + return "unfobjectinfo"; else return ""; } |