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

Make sure matcap icons are within range.

Browse Source 
Basically out of range could happen when opening files made in 2.72 when
the new icons for texture painting were added. Apparently some more
caution is needed here.
This commit is contained in:
Antonis Ryakiotakis
2015-03-23 12:00:34 +01:00
parent c451dba550
commit 0884c174b3
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/space_view3d/drawobject.c
View File

@@ -7232,8 +7232,11 @@ static void draw_object_matcap_check(View3D *v3d, Object *ob)
v3d->defmaterial->preview = NULL;
}
/* first time users */
if (v3d->matcap_icon == 0)
if (v3d->matcap_icon < ICON_MATCAP_01 ||
v3d->matcap_icon > ICON_MATCAP_24)
{
v3d->matcap_icon = ICON_MATCAP_01;
}
if (v3d->defmaterial->preview == NULL)
v3d->defmaterial->preview = UI_icon_to_preview(v3d->matcap_icon);

5
source/blender/makesrna/intern/rna_space.c
View File

@@ -493,8 +493,11 @@ static void rna_SpaceView3D_matcap_enable(Main *UNUSED(bmain), Scene *UNUSED(sce
{
View3D *v3d = (View3D *)(ptr->data);
if (v3d->matcap_icon == 0)
if (v3d->matcap_icon < ICON_MATCAP_01 ||
v3d->matcap_icon > ICON_MATCAP_24)
{
v3d->matcap_icon = ICON_MATCAP_01;
}
}
static void rna_SpaceView3D_pivot_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)