[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50701] trunk/blender/source/blender/ editors/interface/interface_templates.c: fix for bug setting single user obdata while in editmode, it didnt work ( made many copies but didn't assign them), so disable it.

[Campbell Barton]

Revision: 50701
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50701
Author:   campbellbarton
Date:     2012-09-17 22:19:50 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
fix for bug setting single user obdata while in editmode, it didnt work (made many copies but didn't assign them), so disable it.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2012-09-17 21:38:04 UTC (rev 50700)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2012-09-17 22:19:50 UTC (rev 50701)
@@ -35,6 +35,7 @@
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_key_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_object_types.h"
 #include "DNA_userdef_types.h"
 
 #include "BLI_utildefines.h"
@@ -427,8 +428,15 @@
 			               TIP_("Display number of users of this data (click to make a single-user copy)"));
 
 			uiButSetNFunc(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_ALONE));
-			if (!id_copy(id, NULL, 1 /* test only */) || (idfrom && idfrom->lib) || !editable)
+			if (/* test only */
+			    (id_copy(id, NULL, 1) == FALSE) ||
+			    (idfrom && idfrom->lib) ||
+			    (editable == FALSE) ||
+			    /* object in editmode - don't change data */
+			    (idfrom && GS(idfrom->name) == ID_OB && (((Object *)idfrom)->mode & OB_MODE_EDIT)))
+			{
 				uiButSetFlag(but, UI_BUT_DISABLED);
+			}
 		}
 	
 		if (user_alert) uiButSetFlag(but, UI_BUT_REDALERT);