Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / editors / space_buttons / space_buttons.c
index 385f55b..71f8642 100644 (file)
@@ -204,8 +204,6 @@ void buttons_operatortypes(void)
        WM_operatortype_append(PARTICLE_OT_remove_target);
        WM_operatortype_append(PARTICLE_OT_target_move_up);
        WM_operatortype_append(PARTICLE_OT_target_move_down);
-       WM_operatortype_append(PARTICLE_OT_connect_hair);
-       WM_operatortype_append(PARTICLE_OT_disconnect_hair);
 
        WM_operatortype_append(SCENE_OT_render_layer_add);
        WM_operatortype_append(SCENE_OT_render_layer_remove);
@@ -337,6 +335,7 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
                                case ND_TRANSFORM:
                                case ND_BONE_ACTIVE:
                                case ND_BONE_SELECT:
+                               case ND_GEOM_SELECT:
                                case ND_CONSTRAINT:
                                        ED_area_tag_redraw(sa);
                                        break;
@@ -347,13 +346,6 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
                                        break;
                        }
                        break;
-               case NC_GEOM:
-                       switch(wmn->data) {
-                               case ND_SELECT:
-                                       ED_area_tag_redraw(sa);
-                                       break;
-                       }
-                       break;
                case NC_MATERIAL:
                        ED_area_tag_redraw(sa);
                        
@@ -366,15 +358,14 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
                        }                                       
                        break;
                case NC_WORLD:
+                       ED_area_tag_redraw(sa);
+                       sbuts->preview= 1;
                case NC_LAMP:
+                       ED_area_tag_redraw(sa);
+                       sbuts->preview= 1;
                case NC_TEXTURE:
                        ED_area_tag_redraw(sa);
                        sbuts->preview= 1;
-                       break;
-               case NC_SPACE:
-                       if(wmn->data == ND_SPACE_PROPERTIES)
-                               ED_area_tag_redraw(sa);
-                       break;
        }
 
        if(wmn->data == ND_KEYS)