Blender Git Loki
Git Commits -> Revision 302a5b5
Revision 302a5b5 by Jason Wilkins (soc-2014-viewport_fx) July 4, 2014, 20:15 (GMT) |
[OpenGL Policy] BlendFuncSeparate defaults to GL_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO Only set the blend func if the coefficients are different. Return them to the defaults when done. Note: Fairly confident that Blender and the standalone Cycles renderer are correct, but that both the embedded and standalone game engine will need more testing. Note: Do we actually want the default to be: GL_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA? |
Commit Details:
Full Hash: 302a5b56df1937986e54ef4600cca6f6a70d8066
Parent Commit: df33131
Lines Changed: +53, -103
39 Modified Paths:
/intern/cycles/device/device.cpp (+3, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+4, -2) (Diff)
/intern/cycles/util/util_view.cpp (+2, -2) (Diff)
/source/blender/blenfont/intern/blf.c (+0, -1) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+0, -1) (Diff)
/source/blender/editors/animation/anim_draw.c (+0, -1) (Diff)
/source/blender/editors/animation/anim_markers.c (+0, -1) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+0, -1) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+0, -1) (Diff)
/source/blender/editors/interface/interface.c (+0, -3) (Diff)
/source/blender/editors/interface/interface_draw.c (+17, -18) (Diff)
/source/blender/editors/interface/interface_icons.c (+0, -2) (Diff)
/source/blender/editors/interface/interface_widgets.c (+0, -3) (Diff)
/source/blender/editors/mask/mask_draw.c (+1, -3) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+0, -1) (Diff)
/source/blender/editors/screen/area.c (+6, -9) (Diff)
/source/blender/editors/screen/screen_edit.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+0, -3) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+0, -1) (Diff)
/source/blender/editors/space_file/file_draw.c (+0, -2) (Diff)
/source/blender/editors/space_graph/graph_draw.c (+0, -1) (Diff)
/source/blender/editors/space_image/image_draw.c (+0, -5) (Diff)
/source/blender/editors/space_info/textview.c (+0, -1) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+0, -3) (Diff)
/source/blender/editors/space_node/drawnode.c (+0, -1) (Diff)
/source/blender/editors/space_node/node_draw.c (+0, -2) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+0, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+0, -6) (Diff)
/source/blender/editors/space_text/text_draw.c (+1, -2) (Diff)
/source/blender/editors/space_time/space_time.c (+0, -1) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+0, -4) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+0, -4) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+5, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+0, -5) (Diff)
/source/blender/editors/transform/transform.c (+0, -3) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+0, -1) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+0, -3) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+13, -1) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+0, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+4, -2) (Diff)
/intern/cycles/util/util_view.cpp (+2, -2) (Diff)
/source/blender/blenfont/intern/blf.c (+0, -1) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+0, -1) (Diff)
/source/blender/editors/animation/anim_draw.c (+0, -1) (Diff)
/source/blender/editors/animation/anim_markers.c (+0, -1) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+0, -1) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+0, -1) (Diff)
/source/blender/editors/interface/interface.c (+0, -3) (Diff)
/source/blender/editors/interface/interface_draw.c (+17, -18) (Diff)
/source/blender/editors/interface/interface_icons.c (+0, -2) (Diff)
/source/blender/editors/interface/interface_widgets.c (+0, -3) (Diff)
/source/blender/editors/mask/mask_draw.c (+1, -3) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+0, -1) (Diff)
/source/blender/editors/screen/area.c (+6, -9) (Diff)
/source/blender/editors/screen/screen_edit.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+0, -3) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+0, -1) (Diff)
/source/blender/editors/space_file/file_draw.c (+0, -2) (Diff)
/source/blender/editors/space_graph/graph_draw.c (+0, -1) (Diff)
/source/blender/editors/space_image/image_draw.c (+0, -5) (Diff)
/source/blender/editors/space_info/textview.c (+0, -1) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+0, -3) (Diff)
/source/blender/editors/space_node/drawnode.c (+0, -1) (Diff)
/source/blender/editors/space_node/node_draw.c (+0, -2) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+0, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+0, -6) (Diff)
/source/blender/editors/space_text/text_draw.c (+1, -2) (Diff)
/source/blender/editors/space_time/space_time.c (+0, -1) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+0, -4) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+0, -4) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+5, -0) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+0, -5) (Diff)
/source/blender/editors/transform/transform.c (+0, -3) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+0, -1) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+0, -3) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+13, -1) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+0, -1) (Diff)