[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33570] trunk/blender/source/blender: Bugfix #25120 and #25119 and numerous future bugs!

[Ton Roosendaal]

Revision: 33570
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33570
Author:   ton
Date:     2010-12-09 16:49:05 +0100 (Thu, 09 Dec 2010)

Log Message:
-----------
Bugfix #25120 and #25119 and numerous future bugs!

Two isses:
- Material assigning to MetaBalls used wrong pointer
  (copy paste error, casting badly).
- Checking for node-material used wrong RNA pointer
  (confusing void stuff going on here!)

The error leads to corruption in data and/or random
crashes. Better update svn now!

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/material.c
    trunk/blender/source/blender/editors/interface/interface_templates.c

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2010-12-09 11:49:38 UTC (rev 33569)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2010-12-09 15:49:05 UTC (rev 33570)
@@ -445,7 +445,7 @@
 		return &(((Curve *)id)->mat);
 		break;
 	case ID_MB:
-		return &(((Curve *)id)->mat);
+		return &(((MetaBall *)id)->mat);
 		break;
 	}
 	return NULL;
@@ -461,7 +461,7 @@
 		return &(((Curve *)id)->totcol);
 		break;
 	case ID_MB:
-		return &(((Curve *)id)->totcol);
+		return &(((MetaBall *)id)->totcol);
 		break;
 	}
 	return NULL;
@@ -530,6 +530,10 @@
 	totcolp= give_totcolp(ob);
 	if(totcolp==NULL || ob->totcol==0) return NULL;
 	
+	if(act<0) {
+		printf("no!\n");
+	}
+	
 	if(act>ob->totcol) act= ob->totcol;
 	else if(act<=0) act= 1;
 

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2010-12-09 11:49:38 UTC (rev 33569)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2010-12-09 15:49:05 UTC (rev 33570)
@@ -2008,7 +2008,7 @@
 		/* provision to draw active node name */
 		Material *ma, *manode;
 		Object *ob= (Object*)ptr->id.data;
-		int index= (Material**)ptr->data - ob->mat;
+		int index= (Material**)itemptr->data - ob->mat;
 		
 		/* default item with material base name */
 		uiItemL(sub, name, icon);