tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

2.5: bug fixes for some erratice materials buttons drawing.

This commit is contained in:
Brecht Van Lommel 2009-06-24 18:39:00 +00:00
parent b6241e7b7c
commit 169fdf9e97
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/ui/buttons_data_mesh.py
View File

@ -62,7 +62,7 @@ class DATA_PT_materials(DataButtonsPanel):
row = layout.row()
row.template_list(ob, "materials", "active_material_index", items=10)
row.template_list(ob, "materials", "active_material_index")
col = row.column(align=True)
col.itemO("OBJECT_OT_material_slot_add", icon="ICON_ZOOMIN", text="")

3
source/blender/editors/interface/interface_templates.c
View File

@ -1617,7 +1617,8 @@ void uiTemplateList(uiLayout *layout, PointerRNA *ptr, char *propname, char *act
uiBlockSetEmboss(block, UI_EMBOSSN);
len= RNA_property_collection_length(ptr, prop);
CLAMP(scroll, 1, len);
scroll= MIN2(scroll, len-items+1);
scroll= MAX2(scroll, 1);
RNA_BEGIN(ptr, itemptr, propname) {
if(i >= scroll && i<scroll+items) {

2
source/blender/editors/space_buttons/buttons_context.c
View File

@ -552,7 +552,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
if(ptr) {
Object *ob= ptr->data;
if(ob && ob->type && (ob->type<OB_LAMP))
if(ob && ob->type && (ob->type<OB_LAMP) && ob->totcol)
CTX_data_pointer_set(result, &ob->id, &RNA_MaterialSlot, ob->mat+ob->actcol-1);
}

2
source/blender/editors/space_image/image_buttons.c
View File

@ -383,6 +383,7 @@ static void image_editcursor_buts(const bContext *C, View2D *v2d, uiBlock *block
}
}
#if 0
static void image_panel_view_properties(const bContext *C, Panel *pa)
{
SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
@ -439,6 +440,7 @@ static void image_panel_view_properties(const bContext *C, Panel *pa)
}
image_editcursor_buts(C, &ar->v2d, block);
}
#endif
void brush_buttons(const bContext *C, uiBlock *block, short fromsima,
int evt_nop, int evt_change,

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

@ -3566,7 +3566,6 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
static void draw_particle_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, ParticleSystem *psys, int dt)
{
ToolSettings *ts= scene->toolsettings;
ParticleEdit *edit = psys->edit;
ParticleData *pa;
ParticleCacheKey **path;