Merge branch 'master' into temp_remove_particles
authorLukas Tönne <lukas.toenne@gmail.com>
Fri, 15 Apr 2016 15:59:54 +0000 (17:59 +0200)
committerLukas Tönne <lukas.toenne@gmail.com>
Fri, 15 Apr 2016 15:59:54 +0000 (17:59 +0200)
1  2 
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_texture.c

@@@ -262,13 -247,29 +246,15 @@@ void rna_TextureSlot_update(Main *UNUSE
                {
                        MTex *mtex = ptr->data;
                        BKE_paint_invalidate_overlay_tex(scene, mtex->tex);
+                       WM_main_add_notifier(NC_BRUSH, id);
                        break;
                }
 -              case ID_PA:
 -              {
 -                      MTex *mtex = ptr->data;
 -                      int recalc = OB_RECALC_DATA;
 -
 -                      if (mtex->mapto & PAMAP_INIT)
 -                              recalc |= PSYS_RECALC_RESET;
 -                      if (mtex->mapto & PAMAP_CHILD)
 -                              recalc |= PSYS_RECALC_CHILD;
 -
 -                      DAG_id_tag_update(id, recalc);
 -                      WM_main_add_notifier(NC_OBJECT | ND_PARTICLE | NA_EDITED, NULL);
 -                      break;
 -              }
+               case ID_LS:
+                       WM_main_add_notifier(NC_LINESTYLE, id);
+                       break;
        }
-       rna_TextureSlot_update(bmain, scene, ptr);
  }
  
  char *rna_TextureSlot_path(PointerRNA *ptr)
  {
        MTex *mtex = ptr->data;