[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48638] trunk/blender/source/blender/ editors/object/object_relations.c: add the ability to make objects and obdata local but not materials.

[Campbell Barton]

Revision: 48638
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48638
Author:   campbellbarton
Date:     2012-07-05 11:37:04 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
add the ability to make objects and obdata local but not materials.

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	2012-07-05 11:20:31 UTC (rev 48637)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2012-07-05 11:37:04 UTC (rev 48638)
@@ -1742,7 +1742,7 @@
 	ID *id;
 	int a, b, mode = RNA_enum_get(op->ptr, "type");
 	
-	if (mode == 3) {
+	if (mode == 4) {
 		BKE_library_make_local(bmain, NULL, 0); /* NULL is all libs */
 		WM_event_add_notifier(C, NC_WINDOW, NULL);
 		return OPERATOR_FINISHED;
@@ -1770,7 +1770,7 @@
 	{
 		id = ob->data;
 			
-		if (id && mode > 1) {
+		if (id && (mode == 2 || mode == 3)) {
 			id_make_local(id, 0);
 			adt = BKE_animdata_from_id(id);
 			if (adt) BKE_animdata_make_local(adt);
@@ -1794,7 +1794,7 @@
 	}
 	CTX_DATA_END;
 
-	if (mode > 1) {
+	if (mode == 3) {
 		CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
 		{
 			if (ob->type == OB_LAMP) {
@@ -1834,7 +1834,8 @@
 	static EnumPropertyItem type_items[] = {
 		{1, "SELECTED_OBJECTS", 0, "Selected Objects", ""},
 		{2, "SELECTED_OBJECTS_DATA", 0, "Selected Objects and Data", ""},
-		{3, "ALL", 0, "All", ""},
+		{3, "SELECTED_OBJECTS_DATA_MAT", 0, "Selected Objects, Data and Materials", ""},
+		{4, "ALL", 0, "All", ""},
 		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */