Details

Reviewers

Brecht Van Lommel (brecht)
Mike Erwin (merwin)
Dalai Felinto (dfelinto)

Commits

rBS76425feed864: Object Info node support for GLSL mode and the internal render
rBS78b5d66af8e2: Object Info node support for GLSL mode and the internal render
rC9d56e06df08f: Object Info node support for GLSL mode and the internal render
rB76425feed864: Object Info node support for GLSL mode and the internal render
rB78b5d66af8e2: Object Info node support for GLSL mode and the internal render

Summary

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.

Example:

object_info.blend741 KBDownload

Diff Detail

Event Timeline

Alexander Romanov (a.romanov) updated this revision to Diff 8023.Dec 21 2016, 6:46 PM

Alexander Romanov (a.romanov) retitled this revision from to Object Info node support for GLSL mode and the internal render.

Alexander Romanov (a.romanov) updated this object.

Alexander Romanov (a.romanov) added reviewers: Brecht Van Lommel (brecht), Dalai Felinto (dfelinto), Mike Erwin (merwin).

Alexander Romanov (a.romanov) added subscribers: Yuri Kovelenov (yurikovelenov), Alexander Kovelenov (AlexKowel), Evgeny_Rodygin, Konstantin Khomyakov (homyachetser).

Dalai Felinto (dfelinto) added a subscriber: Clément Foucault (fclem).Dec 21 2016, 6:58 PM

Alexander Romanov (a.romanov) updated this object.Mar 1 2017, 4:46 PM

Update for the current master

Looks generally fine to me, always nice to have more complete GLSL support.

source/blender/blenkernel/intern/object_dupli.c
184	Can you add a comment that the logic here is designed to match Cycles? Or even better, expose this random number in RNA so Cycles and other renderers can use it instead of duplicating code.
source/blender/gpu/intern/gpu_draw.c
1909–1910	Code convention is to always use {}
source/blender/render/intern/source/renderdatabase.c
1463–1464	Code convention is to always use {}.

This revision now requires changes to proceed.Apr 9 2017, 6:52 PM

Duarte Farrajota Ramos (duarteframos) awarded a token.Apr 10 2017, 5:19 AM

Duarte Farrajota Ramos (duarteframos) added a subscriber: Duarte Farrajota Ramos (duarteframos).

Fixed style
random_id added to RNA. Now it is interpreted as signed int on Python side (regardless PROP_UNSIGNED). We can leave it as is, or make convertion to float [0,1]. What could be the best solution?

I think it should be unsigned int as you did. It's what I would expect anyways, we don't want different colors assigned to materials because of float precision problems.
Do you know how to make Cycles to use this RNA value?

Do you know how to make Cycles to use this RNA value?

First, I don't know how to return it as unsigned to Python.

We don't have an unsigned int type in RNA, but exposing it as an int should be fine. In practice casting unsigned int -> int -> unsigned int is a no-op.

Using expanded random_id in Cycles

Minor fix of comment

Update for the current state of master branch

Great, looks good to me now. I confirmed the random values in Cycles stayed the same.

This revision is now accepted and ready to land.Apr 14 2017, 4:13 PM

Closed by commit rB78b5d66af8e2: Object Info node support for GLSL mode and the internal render (authored by Alexander Romanov (a.romanov)). · Explain WhyApr 14 2017, 5:15 PM

This revision was automatically updated to reflect the committed changes.

Alexander Romanov (a.romanov) mentioned this in rB11f4b407d4b5: Fix build error on Windows introduced in D2425.Apr 17 2017, 12:40 PM

Brecht Van Lommel (brecht) mentioned this in T51346: Object Info node not working in material view .May 13 2017, 6:27 AM

Object Info node support for GLSL mode and the internal render
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 8531

release/scripts/startup/nodeitems_builtins.py

source/blender/blenkernel/intern/object_dupli.c

source/blender/blenlib/BLI_hash.h

source/blender/gpu/GPU_material.h

source/blender/gpu/intern/gpu_codegen.c

source/blender/gpu/intern/gpu_draw.c

source/blender/gpu/intern/gpu_material.c

source/blender/gpu/intern/gpu_shader.c

source/blender/gpu/shaders/gpu_shader_material.glsl

source/blender/makesdna/DNA_object_types.h

source/blender/nodes/shader/nodes/node_shader_object_info.c

source/blender/render/extern/include/RE_pipeline.h

source/blender/render/extern/include/RE_shader_ext.h

source/blender/render/intern/include/render_types.h

source/blender/render/intern/source/renderdatabase.c

source/blender/render/intern/source/shadeoutput.c

source/blenderplayer/bad_level_call_stubs/stubs.c

source/gameengine/Ketsji/BL_BlenderShader.cpp

Object Info node support for GLSL mode and the internal renderClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 8531

release/scripts/startup/nodeitems_builtins.py

source/blender/blenkernel/intern/object_dupli.c

source/blender/blenlib/BLI_hash.h

source/blender/gpu/GPU_material.h

source/blender/gpu/intern/gpu_codegen.c

source/blender/gpu/intern/gpu_draw.c

source/blender/gpu/intern/gpu_material.c

source/blender/gpu/intern/gpu_shader.c

source/blender/gpu/shaders/gpu_shader_material.glsl

source/blender/makesdna/DNA_object_types.h

source/blender/nodes/shader/nodes/node_shader_object_info.c

source/blender/render/extern/include/RE_pipeline.h

source/blender/render/extern/include/RE_shader_ext.h

source/blender/render/intern/include/render_types.h

source/blender/render/intern/source/renderdatabase.c

source/blender/render/intern/source/shadeoutput.c

source/blenderplayer/bad_level_call_stubs/stubs.c

source/gameengine/Ketsji/BL_BlenderShader.cpp

Object Info node support for GLSL mode and the internal render
ClosedPublic
Actions

Revision Contents
Changeset List