Commit: de37fb099142c929e2d502534177e864434aeb6f
Author: Jeroen Bakker
Date: Thu May 3 09:03:56 2018 +0200
Branches: blender2.8-workbench
https://developer.blender.org/rBde37fb099142c929e2d502534177e864434aeb6f
Merge branch 'blender2.8' into blender2.8-workbench
===================================================================
===================================================================
diff --cc source/blender/draw/intern/DRW_render.h
index 7fd9030bc25,c0f5a0df3bf..95a7479eba0
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@@ -268,11 -271,10 +271,12 @@@ typedef enum
DRW_STATE_TRANSMISSION = (1 << 17),
DRW_STATE_CLIP_PLANES = (1 << 18),
DRW_STATE_ADDITIVE_FULL = (1 << 19), /* Same as DRW_STATE_ADDITIVE but
let alpha accumulate without premult. */
+ DRW_STATE_BLEND_PREMUL = (1 << 20), /* Use that if color is already
premult by alpha. */
- DRW_STATE_WRITE_STENCIL = (1 << 27),
- DRW_STATE_STENCIL_EQUAL = (1 << 28),
+ DRW_STATE_WRITE_STENCIL = (1 << 27),
+ DRW_STATE_STENCIL_EQUAL = (1 << 28),
+ DRW_STATE_STENCIL_NEQUAL = (1 << 29),
+ DRW_STATE_STENCIL_DEPTH_FAIL_INCR_DECR_WRAP = (1 << 30),
} DRWState;
#define DRW_STATE_DEFAULT (DRW_STATE_WRITE_DEPTH | DRW_STATE_WRITE_COLOR |
DRW_STATE_DEPTH_LESS)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
