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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-12-04 21:17:59 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-12-04 21:17:59 +0400
commitb98754836e96e1ffa1733e18b2ffbf4337d37d1c (patch)
treed80cd29b8d0959f264925a69a32379f44c3623c5 /source/blender/editors/space_view3d/space_view3d.c
parentc2a518461c3673b32ac61970c34a5e458ebd4e1b (diff)
Fix T37680: Texture image scale is not refreshing
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
-rw-r--r--source/blender/editors/space_view3d/space_view3d.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 465be94c191..c81c3c79350 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -46,6 +46,7 @@
#include "BKE_icons.h"
#include "BKE_main.h"
#include "BKE_object.h"
+#include "BKE_scene.h"
#include "BKE_screen.h"
#include "ED_render.h"
@@ -828,7 +829,9 @@ static void view3d_main_area_listener(bScreen *sc, ScrArea *sa, ARegion *ar, wmN
case ND_SHADING:
case ND_NODES:
if ((v3d->drawtype == OB_MATERIAL) ||
- (v3d->drawtype == OB_TEXTURE && scene->gm.matmode == GAME_MAT_GLSL))
+ (v3d->drawtype == OB_TEXTURE &&
+ (scene->gm.matmode == GAME_MAT_GLSL ||
+ BKE_scene_use_new_shading_nodes(scene))))
{
ED_region_tag_redraw(ar);
}