[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47117] trunk/blender/source/blender/ editors/space_outliner/outliner_tools.c: fix for own recent commit removing NULL checks from TREESTORE macro - this use needed it .

Campbell Barton ideasman42 at gmail.com
Mon May 28 17:37:43 CEST 2012


Revision: 47117
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47117
Author:   campbellbarton
Date:     2012-05-28 15:37:43 +0000 (Mon, 28 May 2012)
Log Message:
-----------
fix for own recent commit removing NULL checks from TREESTORE macro - this use needed it.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner_tools.c

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tools.c	2012-05-28 15:35:27 UTC (rev 47116)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tools.c	2012-05-28 15:37:43 UTC (rev 47117)
@@ -226,7 +226,7 @@
 		tselem = TREESTORE(te);
 		if (tselem->flag & TSE_SELECTED) {
 			if (tselem->type == 0) {
-				TreeStoreElem *tsep = TREESTORE(te->parent);
+				TreeStoreElem *tsep = te->parent ? TREESTORE(te->parent) : NULL;
 				operation_cb(C, scene, te, tsep, tselem);
 			}
 		}
@@ -866,7 +866,7 @@
 		tselem = TREESTORE(te);
 		if (tselem->flag & TSE_SELECTED) {
 			if (tselem->type == type) {
-				TreeStoreElem *tsep = TREESTORE(te->parent);
+				TreeStoreElem *tsep = te->parent ? TREESTORE(te->parent) : NULL;
 				operation_cb(te, tselem, tsep, newid);
 			}
 		}




More information about the Bf-blender-cvs mailing list