[Bf-blender-cvs] [f7c987b] master: Fix outliner crash after recent no-functional-changes cleanup commits

Sergey Sharybin noreply at git.blender.org
Tue Nov 24 10:25:14 CET 2015


Commit: f7c987b0ab08f6121f6107a491d6fdb9a737858c
Author: Sergey Sharybin
Date:   Tue Nov 24 14:24:26 2015 +0500
Branches: master
https://developer.blender.org/rBf7c987b0ab08f6121f6107a491d6fdb9a737858c

Fix outliner crash after recent no-functional-changes cleanup commits

===================================================================

M	source/blender/editors/space_outliner/outliner_tree.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index a0d66fb..f2d8321 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -587,7 +587,7 @@ static void outliner_add_object_contents(SpaceOops *soops, TreeElement *te, Tree
 				ParticleSystem *psys = ((ParticleSystemModifierData *) md)->psys;
 				TreeElement *ten_psys;
 				
-				ten_psys = outliner_add_element(soops, &ten_psys->subtree, ob, ten_psys, TSE_LINKED_PSYS, 0);
+				ten_psys = outliner_add_element(soops, &ten->subtree, ob, te, TSE_LINKED_PSYS, 0);
 				ten_psys->directdata = psys;
 				ten_psys->name = psys->part->id.name + 2;
 			}




More information about the Bf-blender-cvs mailing list