[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57772] trunk/blender/source/blender: Fix #35879: missing 3D viewport redraws when changing lamp settings, after recent

[Brecht Van Lommel]

Revision: 57772
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57772
Author:   blendix
Date:     2013-06-26 12:33:30 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Fix #35879: missing 3D viewport redraws when changing lamp settings, after recent
changes to avoid unnecessary redraws.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c
    trunk/blender/source/blender/makesrna/intern/rna_lamp.c

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2013-06-26 12:24:36 UTC (rev 57771)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2013-06-26 12:33:30 UTC (rev 57772)
@@ -831,13 +831,16 @@
 			break;
 		case NC_LAMP:
 			switch (wmn->data) {
-				case ND_LIGHTING_DRAW:
+				case ND_LIGHTING:
 					if ((v3d->drawtype == OB_MATERIAL) ||
 					    (v3d->drawtype == OB_TEXTURE && (scene->gm.matmode == GAME_MAT_GLSL)))
 					{
 						ED_region_tag_redraw(ar);
 					}
 					break;
+				case ND_LIGHTING_DRAW:
+					ED_region_tag_redraw(ar);
+					break;
 			}
 			break;
 		case NC_IMAGE:

Modified: trunk/blender/source/blender/makesrna/intern/rna_lamp.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_lamp.c	2013-06-26 12:24:36 UTC (rev 57771)
+++ trunk/blender/source/blender/makesrna/intern/rna_lamp.c	2013-06-26 12:33:30 UTC (rev 57772)
@@ -136,10 +136,7 @@
 	Lamp *la = ptr->id.data;
 
 	DAG_id_tag_update(&la->id, 0);
-	if (scene->gm.matmode == GAME_MAT_GLSL)
-		WM_main_add_notifier(NC_LAMP | ND_LIGHTING_DRAW, la);
-	else
-		WM_main_add_notifier(NC_LAMP | ND_LIGHTING, la);
+	WM_main_add_notifier(NC_LAMP | ND_LIGHTING, la);
 }
 
 static void rna_Lamp_draw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)