[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21135] branches/blender2.5/blender: 2.5: bug fixes for some erratice materials buttons drawing.

[Brecht Van Lommel]

Revision: 21135
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21135
Author:   blendix
Date:     2009-06-24 20:39:00 +0200 (Wed, 24 Jun 2009)

Log Message:
-----------
2.5: bug fixes for some erratice materials buttons drawing.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_data_mesh.py
    branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
    branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_context.c
    branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c
    branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c

Modified: branches/blender2.5/blender/release/ui/buttons_data_mesh.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_mesh.py	2009-06-24 17:57:10 UTC (rev 21134)
+++ branches/blender2.5/blender/release/ui/buttons_data_mesh.py	2009-06-24 18:39:00 UTC (rev 21135)
@@ -62,7 +62,7 @@
 
 		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="")

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c	2009-06-24 17:57:10 UTC (rev 21134)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c	2009-06-24 18:39:00 UTC (rev 21135)
@@ -1617,7 +1617,8 @@
 	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) {

Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_context.c	2009-06-24 17:57:10 UTC (rev 21134)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_context.c	2009-06-24 18:39:00 UTC (rev 21135)
@@ -552,7 +552,7 @@
 		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);
 		}
 

Modified: branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c	2009-06-24 17:57:10 UTC (rev 21134)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_buttons.c	2009-06-24 18:39:00 UTC (rev 21135)
@@ -383,6 +383,7 @@
 	}
 }
 
+#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 @@
 	}
 	image_editcursor_buts(C, &ar->v2d, block);
 }
+#endif
 
 void brush_buttons(const bContext *C, uiBlock *block, short fromsima,
 				   int evt_nop, int evt_change,

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c	2009-06-24 17:57:10 UTC (rev 21134)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c	2009-06-24 18:39:00 UTC (rev 21135)
@@ -3566,7 +3566,6 @@
 
 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;