archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #21166: changing image file path does not update texture preview. I've

Browse Source 
made it regenerate previews and icons now for this case. Depsgraph for all
datablocks could solve this much nicer..
This commit is contained in:
Brecht Van Lommel
2010-04-06 16:53:48 +00:00
parent 7b4536b3a9
commit be6d0ca63b
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/render/render_shading.c
View File

@@ -196,6 +196,19 @@ static void world_changed(Main *bmain, World *wo)
GPU_material_free(ma);
}
static void image_changed(Main *bmain, Image *ima)
{
Tex *tex;
/* icons */
BKE_icon_changed(BKE_icon_getid(&ima->id));
/* textures */
for(tex=bmain->tex.first; tex; tex=tex->id.next)
if(tex->ima == ima)
texture_changed(bmain, tex);
}
void ED_render_id_flush_update(Main *bmain, ID *id)
{
if(!id)
@@ -214,6 +227,9 @@ void ED_render_id_flush_update(Main *bmain, ID *id)
case ID_LA:
lamp_changed(bmain, (Lamp*)id);
break;
case ID_IM:
image_changed(bmain, (Image*)id);
break;
default:
break;
}

1
source/blender/editors/space_buttons/space_buttons.c
View File

@@ -341,6 +341,7 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
sbuts->preview= 1;
break;
case NC_TEXTURE:
case NC_IMAGE:
ED_area_tag_redraw(sa);
sbuts->preview= 1;
break;

3
source/blender/makesrna/intern/rna_image.c
View File

@@ -33,6 +33,7 @@
#include "DNA_scene_types.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_image.h"
#include "WM_types.h"
@@ -78,6 +79,7 @@ static void rna_Image_source_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
Image *ima= ptr->id.data;
BKE_image_signal(ima, NULL, IMA_SIGNAL_SRC_CHANGE);
DAG_id_flush_update(&ima->id, 0);
}
static void rna_Image_fields_update(Main *bmain, Scene *scene, PointerRNA *ptr)
@@ -105,6 +107,7 @@ static void rna_Image_reload_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
Image *ima= ptr->id.data;
BKE_image_signal(ima, NULL, IMA_SIGNAL_RELOAD);
DAG_id_flush_update(&ima->id, 0);
}
static void rna_Image_generated_update(Main *bmain, Scene *scene, PointerRNA *ptr)