Blender Git Loki

Git Commits -> Revision 78b5d66

Revision 78b5d66 by Alexander Romanov (master)
April 14, 2017, 15:15 (GMT)
Object Info node support for GLSL mode and the internal render

Object Info node can be useful to give some variation to a single material assigned to multiple instances. This patch adds support for Viewport and BI.

{F499530}

Example: {F499528}

Reviewers: merwin, brecht, dfelinto

Reviewed By: brecht

Subscribers: duarteframos, fclem, homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov

Differential Revision: https://developer.blender.org/D2425

Commit Details:

Full Hash: 78b5d66af8e29ddfd234fb07bd36be785702901e
Parent Commit: 6fc7521
Lines Changed: +179, -25

1 Added Path:

/source/blender/blenlib/BLI_hash.h (+66, -0) (View)

19 Modified Paths:

/intern/cycles/blender/blender_object.cpp (+3, -14) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+1, -0) (Diff)
/source/blender/blenkernel/intern/object_dupli.c (+17, -0) (Diff)
/source/blender/gpu/GPU_material.h (+4, -1) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+22, -1) (Diff)
/source/blender/gpu/intern/gpu_material.c (+13, -1) (Diff)
/source/blender/gpu/intern/gpu_shader.c (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+5, -5) (Diff)
/source/blender/makesdna/DNA_object_types.h (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_object_info.c (+11, -1) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+4, -0) (Diff)
/source/blender/render/intern/include/render_types.h (+2, -0) (Diff)
/source/blender/render/intern/source/renderdatabase.c (+9, -0) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+10, -0) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021