[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33162] trunk/blender/source/blender/ editors/interface/interface_templates.c: fix for missing NULL check in last commit.

[Campbell Barton]

Revision: 33162
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33162
Author:   campbellbarton
Date:     2010-11-18 17:47:22 +0100 (Thu, 18 Nov 2010)

Log Message:
-----------
fix for missing NULL check in last commit.

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

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2010-11-18 16:38:32 UTC (rev 33161)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2010-11-18 16:47:22 UTC (rev 33162)
@@ -2011,14 +2011,17 @@
 		uiItemL(sub, name, icon);
 		
 		ma= give_current_material(ob, index+1);
-		manode= give_node_material(ma);
-		if(manode) {
-			char str[MAX_ID_NAME + 12];
-			sprintf(str, "Node %s", manode->id.name+2);
-			uiItemL(sub, str, ui_id_icon_get(C, &manode->id, 1));
+		if(ma) {
+			manode= give_node_material(ma);
+			if(manode) {
+				char str[MAX_ID_NAME + 12];
+				sprintf(str, "Node %s", manode->id.name+2);
+				uiItemL(sub, str, ui_id_icon_get(C, &manode->id, 1));
+			}
+			else if(ma->use_nodes) {
+				uiItemL(sub, "Node <none>", 0);
+			}
 		}
-		else if(ma->use_nodes)
-			uiItemL(sub, "Node <none>", 0);
 	}
 	else if(itemptr->type == &RNA_ShapeKey) {
 		ob= (Object*)activeptr->data;