Fix T43427: Particle system children sometimes not generated on reload
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Jan 2015 11:14:53 +0000 (16:14 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Jan 2015 11:14:53 +0000 (16:14 +0500)
commitd9c77a490cc5ed9dde396022cd6800e78057cc2b
treea4409775545a12ceea861d69d1a689330f5d1b1f
parentdf07a25d2811c43648af3e9bf4cc44d255218d65
Fix T43427: Particle system children sometimes not generated on reload

The issue was caused by the conflict between preview render which would set
R_NO_IMAGE_LOAD flag on the renderer and texture samplers called outside of
the render pipeline trying to use this flag.

Now the sampler functions accepts extra argument so render pipeline can
still skip image load, but calls outside of the pipeline will nicely load
all the images.

Not cleanest change in the world but good enough to unlock gooseberry team,
and assuming we already had pool passed all over the place it should be all
fine.

Will need to reshuffle arguments into SamplerOptions structure later.
18 files changed:
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/texture.c
source/blender/compositor/operations/COM_TextureOperation.cpp
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/makesrna/intern/rna_texture_api.c
source/blender/render/extern/include/RE_render_ext.h
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/include/envmap.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/include/texture.h
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/imagetexture.c
source/blender/render/intern/source/render_texture.c
source/blender/render/intern/source/renderdatabase.c