Blender Git Commit Log
Git Commits -> Revision bc6a75b
Revision bc6a75b by Dalai Felinto (master) April 18, 2017, 14:29 (GMT) |
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. |
Commit Details:
Full Hash: bc6a75b405c4e0b1e85c9c6ec6646fd2d3f67686
Parent Commit: b8fd6f9
Lines Changed: +26, -181
1 Deleted Path:
/source/blender/blenlib/BLI_hash.h (+0, -66)
19 Modified Paths:
/intern/cycles/blender/blender_object.cpp (+14, -3) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+0, -1) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+0, -17) (Diff)
/source/blender/gpu/GPU_material.h (+1, -4) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+0, -2) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+2, -24) (Diff)
/source/blender/gpu/intern/gpu_material.c (+1, -13) (Diff)
/source/blender/gpu/intern/gpu_shader.c (+0, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+5, -5) (Diff)
/source/blender/makesdna/DNA_object_types.h (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_object.c (+0, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_object_info.c (+1, -11) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+0, -4) (Diff)
/source/blender/render/intern/include/render_types.h (+0, -2) (Diff)
/source/blender/render/intern/source/renderdatabase.c (+0, -9) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+0, -10) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+0, -1) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+0, -1) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+0, -17) (Diff)
/source/blender/gpu/GPU_material.h (+1, -4) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+0, -2) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+2, -24) (Diff)
/source/blender/gpu/intern/gpu_material.c (+1, -13) (Diff)
/source/blender/gpu/intern/gpu_shader.c (+0, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+5, -5) (Diff)
/source/blender/makesdna/DNA_object_types.h (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_object.c (+0, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_object_info.c (+1, -11) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+0, -4) (Diff)
/source/blender/render/intern/include/render_types.h (+0, -2) (Diff)
/source/blender/render/intern/source/renderdatabase.c (+0, -9) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+0, -10) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+0, -1) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)