[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51397] trunk/blender/source/blender: Fix #32896: No compositor tree update with image input color space change

[Sergey Sharybin]

Revision: 51397
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51397
Author:   nazgul
Date:     2012-10-18 09:48:51 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
Fix #32896: No compositor tree update with image input color space change

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/movieclip.c
    trunk/blender/source/blender/editors/space_node/space_node.c
    trunk/blender/source/blender/makesrna/intern/rna_color.c

Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-10-18 04:51:37 UTC (rev 51396)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-10-18 09:48:51 UTC (rev 51397)
@@ -1091,6 +1091,18 @@
 	movieclip_load_get_szie(clip);
 
 	movieclip_calc_length(clip);
+
+	/* same as for image update -- don't use notifiers because they are not 100% sure to succeeded
+	 * (node trees which are not currently visible wouldn't be refreshed)
+	 */
+	{
+		Scene *scene;
+		for (scene = G.main->scene.first; scene; scene = scene->id.next) {
+			if (scene->nodetree) {
+				nodeUpdateID(scene->nodetree, &clip->id);
+			}
+		}
+	}
 }
 
 void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClipScopes *scopes)

Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c	2012-10-18 04:51:37 UTC (rev 51396)
+++ trunk/blender/source/blender/editors/space_node/space_node.c	2012-10-18 09:48:51 UTC (rev 51397)
@@ -254,6 +254,15 @@
 				}
 			}
 			break;
+
+		case NC_MOVIECLIP:
+			if (wmn->action == NA_EDITED) {
+				if (type == NTREE_COMPOSIT) {
+					if (nodeUpdateID(snode->nodetree, wmn->reference))
+						ED_area_tag_refresh(sa);
+				}
+			}
+			break;
 	}
 }
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_color.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_color.c	2012-10-18 04:51:37 UTC (rev 51396)
+++ trunk/blender/source/blender/makesrna/intern/rna_color.c	2012-10-18 09:48:51 UTC (rev 51397)
@@ -475,13 +475,17 @@
 		Image *ima = (Image *) id;
 
 		BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD);
+
 		WM_main_add_notifier(NC_IMAGE | ND_DISPLAY, &ima->id);
+		WM_main_add_notifier(NC_IMAGE | NA_EDITED, &ima->id);
 	}
 	else if (GS(id->name) == ID_MC) {
 		MovieClip *clip = (MovieClip *) id;
 
 		BKE_movieclip_reload(clip);
+
 		WM_main_add_notifier(NC_MOVIECLIP | ND_DISPLAY, &clip->id);
+		WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, &clip->id);
 	}
 }