Blender Git Loki
Git Commits -> Revision d9c77a4
Revision d9c77a4 by Sergey Sharybin (master) January 27, 2015, 11:14 (GMT) |
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. |
Commit Details:
Full Hash: d9c77a490cc5ed9dde396022cd6800e78057cc2b
Parent Commit: df07a25
Lines Changed: +96, -83
18 Modified Paths:
/source/blender/blenkernel/intern/brush.c (+6, -6) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/effect.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/particle.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -1) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.cpp (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_utils.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_texture_api.c (+1, -1) (Diff)
/source/blender/render/extern/include/RE_render_ext.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+2, -2) (Diff)
/source/blender/render/intern/include/envmap.h (+1, -1) (Diff)
/source/blender/render/intern/include/render_types.h (+1, -0) (Diff)
/source/blender/render/intern/include/texture.h (+2, -2) (Diff)
/source/blender/render/intern/source/envmap.c (+5, -5) (Diff)
/source/blender/render/intern/source/imagetexture.c (+7, -7) (Diff)
/source/blender/render/intern/source/renderdatabase.c (+6, -2) (Diff)
/source/blender/render/intern/source/render_texture.c (+51, -43) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/effect.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/particle.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -1) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.cpp (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_utils.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_texture_api.c (+1, -1) (Diff)
/source/blender/render/extern/include/RE_render_ext.h (+1, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+2, -2) (Diff)
/source/blender/render/intern/include/envmap.h (+1, -1) (Diff)
/source/blender/render/intern/include/render_types.h (+1, -0) (Diff)
/source/blender/render/intern/include/texture.h (+2, -2) (Diff)
/source/blender/render/intern/source/envmap.c (+5, -5) (Diff)
/source/blender/render/intern/source/imagetexture.c (+7, -7) (Diff)
/source/blender/render/intern/source/renderdatabase.c (+6, -2) (Diff)
/source/blender/render/intern/source/render_texture.c (+51, -43) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021