Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-04-18 17:06:01 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-04-18 17:29:42 +0300
commitbc6a75b405c4e0b1e85c9c6ec6646fd2d3f67686 (patch)
tree1dd28ef80fa66fc0703ead335e2801fa10aa6ec4 /source/blender/gpu/intern/gpu_codegen.c
parentb8fd6f94a06c65f6bfe90d9cc45ae1406cd0dc27 (diff)
Revert "Object Info node support for GLSL mode and the internal render"
This reverts commit 76425feed8644a8fe1c0e52ef3f77b95012ba44e. ** Note ** This was supposed to be a merge, but it was rebased.
Diffstat (limited to 'source/blender/gpu/intern/gpu_codegen.c')
-rw-r--r--source/blender/gpu/intern/gpu_codegen.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index de2b94482f4..faf1b907570 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -410,8 +410,6 @@ 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 "";
}