[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57457] trunk/blender/source/blender: Code cleanup: removed unused B_BUTSPREVIEW event, and moved back rna_SpaceProperties_texture_context_itemf() together with its fellow functions.

[Bastien Montagne]

Revision: 57457
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57457
Author:   mont29
Date:     2013-06-14 15:48:03 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
Code cleanup: removed unused B_BUTSPREVIEW event, and moved back rna_SpaceProperties_texture_context_itemf() together with its fellow functions.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_buttons/buttons_header.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_header.c	2013-06-14 15:11:28 UTC (rev 57456)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_header.c	2013-06-14 15:48:03 UTC (rev 57457)
@@ -58,7 +58,6 @@
 
 
 #define B_CONTEXT_SWITCH    101
-#define B_BUTSPREVIEW       102
 
 static void set_texture_context(const bContext *C, SpaceButs *sbuts)
 {
@@ -95,7 +94,6 @@
 
 	switch (event) {
 		case B_CONTEXT_SWITCH:
-		case B_BUTSPREVIEW:
 			ED_area_tag_redraw(CTX_wm_area(C));
 
 			set_texture_context(C, sbuts);

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2013-06-14 15:11:28 UTC (rev 57456)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2013-06-14 15:48:03 UTC (rev 57457)
@@ -839,6 +839,37 @@
 	sbuts->re_align = 1;
 }
 
+static EnumPropertyItem *rna_SpaceProperties_texture_context_itemf(bContext *C, PointerRNA *UNUSED(ptr),
+                                                                   PropertyRNA *UNUSED(prop), int *free)
+{
+	EnumPropertyItem *item = NULL;
+	int totitem = 0;
+
+	if (ED_texture_context_check_world(C)) {
+		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_WORLD);
+	}
+
+	if (ED_texture_context_check_lamp(C)) {
+		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_LAMP);
+	}
+	else if (ED_texture_context_check_material(C)) {
+		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_MATERIAL);
+	}
+
+	if (ED_texture_context_check_particles(C)) {
+		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_PARTICLES);
+	}
+
+	if (ED_texture_context_check_others(C)) {
+		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_OTHER);
+	}
+
+	RNA_enum_item_end(&item, &totitem);
+	*free = 1;
+
+	return item;
+}
+
 /* Space Console */
 static void rna_ConsoleLine_body_get(PointerRNA *ptr, char *value)
 {
@@ -1129,37 +1160,6 @@
 	ED_node_tree_update(C);
 }
 
-static EnumPropertyItem *rna_SpaceProperties_texture_context_itemf(bContext *C, PointerRNA *UNUSED(ptr),
-                                                                   PropertyRNA *UNUSED(prop), int *free)
-{
-	EnumPropertyItem *item = NULL;
-	int totitem = 0;
-
-	if (ED_texture_context_check_world(C)) {
-		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_WORLD);
-	}
-
-	if (ED_texture_context_check_lamp(C)) {
-		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_LAMP);
-	}
-	else if (ED_texture_context_check_material(C)) {
-		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_MATERIAL);
-	}
-
-	if (ED_texture_context_check_particles(C)) {
-		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_PARTICLES);
-	}
-
-	if (ED_texture_context_check_others(C)) {
-		RNA_enum_items_add_value(&item, &totitem, buttons_texture_context_items, SB_TEXC_OTHER);
-	}
-
-	RNA_enum_item_end(&item, &totitem);
-	*free = 1;
-
-	return item;
-}
-
 static void rna_SpaceClipEditor_clip_set(PointerRNA *ptr, PointerRNA value)
 {
 	SpaceClip *sc = (SpaceClip *)(ptr->data);