diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-09-17 03:54:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-17 03:54:33 +0400 |
| commit | 771bad9c6abaad4b742935e5d55067f281287650 (patch) | |
| tree | f5325241d866890ae7a155eb112019090dfbf05a /source/blender/makesrna/intern/rna_material.c | |
| parent | 3cdfea119d93ea3d1ec5096cb7d218c7ae4991d5 (diff) | |
| parent | f0f398dcf3101079f4965185eb82c23c54fc6923 (diff) | |
Merge branch 'master' into soc-2014-viewport_context
Diffstat (limited to 'source/blender/makesrna/intern/rna_material.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_material.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 37b6947cfac..1ef39ec4a77 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -195,14 +195,17 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *s nodeSetActive(ma->nodetree, node); } - for (sc = bmain->screen.first; sc; sc = sc->id.next) { - ScrArea *sa; - for (sa = sc->areabase.first; sa; sa = sa->next) { - SpaceLink *sl; - for (sl = sa->spacedata.first; sl; sl = sl->next) { - if (sl->spacetype == SPACE_IMAGE) { - SpaceImage *sima = (SpaceImage *)sl; - ED_space_image_set(sima, scene, scene->obedit, ma->texpaintslot[ma->paint_active_slot].ima); + if (ma->texpaintslot) { + Image *image = ma->texpaintslot[ma->paint_active_slot].ima; + for (sc = bmain->screen.first; sc; sc = sc->id.next) { + ScrArea *sa; + for (sa = sc->areabase.first; sa; sa = sa->next) { + SpaceLink *sl; + for (sl = sa->spacedata.first; sl; sl = sl->next) { + if (sl->spacetype == SPACE_IMAGE) { + SpaceImage *sima = (SpaceImage *)sl; + ED_space_image_set(sima, scene, scene->obedit, image); + } } } } @@ -337,7 +340,7 @@ static void rna_Material_use_nodes_update(bContext *C, PointerRNA *ptr) if (ma->use_nodes && ma->nodetree == NULL) ED_node_shader_default(C, &ma->id); - rna_Material_update(CTX_data_main(C), CTX_data_scene(C), ptr); + rna_Material_draw_update(CTX_data_main(C), CTX_data_scene(C), ptr); } static EnumPropertyItem *rna_Material_texture_coordinates_itemf(bContext *UNUSED(C), PointerRNA *ptr, |