Blender Git Commit Log
Git Commits -> Revision 771f73b
Revision 771f73b by Alexander Romanov (master) January 27, 2016, 09:06 (GMT) |
World textures displaying for viewport in BI. This patch supports "Image or Movie" and "Environment map" types of world texture for the viewport. It supports: - "View", "AngMap" and "Equirectangular" types of mapping. - Different types of texture blending (according to BI world render). - Same color blending as when it lacked textures (but render via glsl). {F207734} {F207735} Example: {F275180} Original author: @valentin_b4w Regards, Alexander (Blend4Web Team). Reviewers: sergey, valentin_b4w, brecht, merwin Reviewed By: merwin Subscribers: campbellbarton, merwin, blueprintrandom, youle, a.romanov, yurikovelenov, AlexKowel, Evgeny_Rodygin Projects: #rendering, #opengl_gfx, #bf_blender:_next Differential Revision: https://developer.blender.org/D1414 |
Commit Details:
Full Hash: 771f73b6bedbdd1c1e2993bd8d3680d53fa67b7c
Parent Commit: f6ff8f2
Lines Changed: +619, -141
21 Modified Paths:
/source/blender/blenkernel/BKE_image.h (+3, -0) (Diff)
/source/blender/blenkernel/intern/image.c (+12, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+13, -7) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+5, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+2, -2) (Diff)
/source/blender/gpu/GPU_draw.h (+6, -6) (Diff)
/source/blender/gpu/GPU_extensions.h (+1, -0) (Diff)
/source/blender/gpu/GPU_material.h (+3, -0) (Diff)
/source/blender/gpu/GPU_texture.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+33, -7) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+2, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+243, -86) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+7, -0) (Diff)
/source/blender/gpu/intern/gpu_material.c (+195, -1) (Diff)
/source/blender/gpu/intern/gpu_texture.c (+30, -15) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+45, -0) (Diff)
/source/blender/makesdna/DNA_image_types.h (+9, -2) (Diff)
/source/blender/makesrna/intern/rna_image_api.c (+4, -4) (Diff)
/source/blender/python/intern/gpu.c (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_Texture.cpp (+1, -1) (Diff)
/source/gameengine/VideoTexture/Texture.cpp (+3, -3) (Diff)
/source/blender/blenkernel/intern/image.c (+12, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+13, -7) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+5, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+2, -2) (Diff)
/source/blender/gpu/GPU_draw.h (+6, -6) (Diff)
/source/blender/gpu/GPU_extensions.h (+1, -0) (Diff)
/source/blender/gpu/GPU_material.h (+3, -0) (Diff)
/source/blender/gpu/GPU_texture.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+33, -7) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+2, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+243, -86) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+7, -0) (Diff)
/source/blender/gpu/intern/gpu_material.c (+195, -1) (Diff)
/source/blender/gpu/intern/gpu_texture.c (+30, -15) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+45, -0) (Diff)
/source/blender/makesdna/DNA_image_types.h (+9, -2) (Diff)
/source/blender/makesrna/intern/rna_image_api.c (+4, -4) (Diff)
/source/blender/python/intern/gpu.c (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_Texture.cpp (+1, -1) (Diff)
/source/gameengine/VideoTexture/Texture.cpp (+3, -3) (Diff)