diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-10-23 15:39:45 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-10-23 15:39:45 +0400 |
commit | 3b7794dab727897967abd829562c2328900225cf (patch) | |
tree | 477f7b50a8a3890b0d95db92e44f9f98f38e4d84 /source/blender/blenkernel/intern | |
parent | eaaeae469968c5c78a5d7e6d202f1af00b382a79 (diff) |
Fix T42330 game engine does not allow texture slots generation.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index eeca60f7ef4..ea1b9a3f13d 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1320,7 +1320,7 @@ void BKE_texpaint_slot_refresh_cache(Scene *scene, Material *ma) short index = 0, i; bool use_nodes = BKE_scene_use_new_shading_nodes(scene); - bool is_bi = BKE_scene_uses_blender_internal(scene); + bool is_bi = BKE_scene_uses_blender_internal(scene) || BKE_scene_uses_blender_game(scene); if (!ma) return; diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 5bfd6e8a120..9e6e49998ae 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1905,6 +1905,10 @@ bool BKE_scene_uses_blender_internal(struct Scene *scene) return strcmp("BLENDER_RENDER", scene->r.engine) == 0; } +bool BKE_scene_uses_blender_game(struct Scene *scene) +{ + return strcmp("BLENDER_GAME", scene->r.engine) == 0; +} void BKE_scene_base_flag_to_objects(struct Scene *scene) { |