Blender Git Loki
Git Commits -> Revision 1dd7156
Revision 1dd7156 by Sergey Sharybin (master) July 15, 2013, 14:47 (GMT) |
Fix #36058: Displace Modifier errors using a baked Image and displace baking inconsistency between 2.67/2.68RC and previous versions This was in fact really nasty bug, caused by multitex_nodes function using global variable R (which is a copy of current renderer). this variable is not initialized to anything meaningful for until first rendering (preview or final) happened. Since multitex_nodes might be used outside of render pipeline, made it so whether CM is on or off as an argument to functions multitex_ext_safe and multitex_ext. Now multitex_nodes() is only shall be used for stuff happening from render pipeline! Also needed to make some changes to other places, so all the usages of texture sampling knows for the fact whether CM is on or off. And one more change is related on behavior of dispalcement, wave, warp, weightvg modifiers and smoke. They'll be always using CM off since texture is used for influence, not for color. It's rather bigger patch, but it's mostly straightforward changes, which we really need to be done. Reviewed by Brecht, thanks! |
Commit Details:
Full Hash: 1dd7156c4c1d6a62f17fb6621ec3dc31297ba54a
SVN Revision: 58270
Parent Commit: 86ba5c4
Lines Changed: +104, -50
21 Modified Paths:
/source/blender/blenkernel/BKE_dynamicpaint.h (+4, -3) (Diff)
/source/blender/blenkernel/intern/brush.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+14, -13) (Diff)
/source/blender/blenkernel/intern/effect.c (+7, -4) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+10, -0) (Diff)
/source/blender/blenkernel/intern/smoke.c (+3, -1) (Diff)
/source/blender/compositor/nodes/COM_TextureNode.cpp (+4, -0) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.cpp (+3, -1) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.h (+2, -0) (Diff)
/source/blender/editors/physics/dynamicpaint_ops.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_dynamicpaint.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_texture_api.c (+3, -1) (Diff)
/source/blender/modifiers/intern/MOD_displace.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+8, -2) (Diff)
/source/blender/modifiers/intern/MOD_util.h (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_warp.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_wave.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvg_util.c (+4, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+4, -3) (Diff)
/source/blender/render/intern/source/render_texture.c (+27, -11) (Diff)
/source/blender/blenkernel/intern/brush.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+14, -13) (Diff)
/source/blender/blenkernel/intern/effect.c (+7, -4) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+10, -0) (Diff)
/source/blender/blenkernel/intern/smoke.c (+3, -1) (Diff)
/source/blender/compositor/nodes/COM_TextureNode.cpp (+4, -0) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.cpp (+3, -1) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.h (+2, -0) (Diff)
/source/blender/editors/physics/dynamicpaint_ops.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_dynamicpaint.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_texture_api.c (+3, -1) (Diff)
/source/blender/modifiers/intern/MOD_displace.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+8, -2) (Diff)
/source/blender/modifiers/intern/MOD_util.h (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_warp.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_wave.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvg_util.c (+4, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+4, -3) (Diff)
/source/blender/render/intern/source/render_texture.c (+27, -11) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021