[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57933] trunk/blender/source/blender/ editors/object/object_relations.c: Fix #35964: viewport render not updating with linking materials with ctrl+L.

[Brecht Van Lommel]

Revision: 57933
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57933
Author:   blendix
Date:     2013-07-02 17:21:40 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Fix #35964: viewport render not updating with linking materials with ctrl+L.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_relations.c

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2013-07-02 16:02:56 UTC (rev 57932)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2013-07-02 17:21:40 UTC (rev 57933)
@@ -1472,6 +1472,7 @@
 							Material *ma = give_current_material(ob_src, a + 1);
 							assign_material(ob_dst, ma, a + 1, BKE_MAT_ASSIGN_USERPREF); /* also works with ma==NULL */
 						}
+						DAG_id_tag_update(&ob_dst->id, 0);
 						break;
 					case MAKE_LINKS_ANIMDATA:
 						BKE_copy_animdata_id((ID *)ob_dst, (ID *)ob_src, FALSE);
@@ -1480,6 +1481,7 @@
 							break;
 						}
 						BKE_copy_animdata_id((ID *)ob_dst->data, (ID *)ob_src->data, FALSE);
+						DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 						break;
 					case MAKE_LINKS_GROUP:
 					{