[Bf-blender-cvs] [b987548] master: Fix T37680: Texture image scale is not refreshing
Sergey Sharybin
noreply at git.blender.org
Wed Dec 4 18:18:14 CET 2013
Commit: b98754836e96e1ffa1733e18b2ffbf4337d37d1c
Author: Sergey Sharybin
Date: Wed Dec 4 23:17:59 2013 +0600
http://developer.blender.org/rBb98754836e96e1ffa1733e18b2ffbf4337d37d1c
Fix T37680: Texture image scale is not refreshing
===================================================================
M source/blender/editors/space_view3d/space_view3d.c
===================================================================
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 465be94..c81c3c7 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);
}
More information about the Bf-blender-cvs
mailing list