Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-05-22 16:31:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-05-23 10:40:48 +0300
commitf21c235c6fa6782dfc9c0ba7a66fa3c1005b2897 (patch)
tree2059c43758cfa26d15bd4fed1e9af29d332a1fe6 /source/blender/blenkernel
parent44f91a9a18d6d942d958e7640f4d1c301d230150 (diff)
DwM: texture paint support & mask mode
Uses workaround so material slots are used when neither blender-internal or cycles are enabled.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/material.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 0ce0528546c..fb4aec0a380 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1305,6 +1305,14 @@ void BKE_texpaint_slot_refresh_cache(Scene *scene, Material *ma)
bool use_nodes = BKE_scene_use_new_shading_nodes(scene);
bool is_bi = BKE_scene_uses_blender_internal(scene) || BKE_scene_uses_blender_game(scene);
+
+ /* XXX, for 2.8 testing & development its useful to have non Cycles/BI engines use material nodes
+ * In the future we may have some way to check this which each engine can define.
+ * For now use material slots for Clay/Eevee.
+ * - Campbell */
+ if (!(use_nodes || is_bi)) {
+ is_bi = true;
+ }
if (!ma)
return;