Commit: 3c755fd6a542ae2a0f3a2fb7788d277449045023
Author: Campbell Barton
Date: Tue Feb 10 02:03:55 2015 +1100
Branches: master
https://developer.blender.org/rB3c755fd6a542ae2a0f3a2fb7788d277449045023
Fix outliner crash renaming library /w filter
D1045 by @a.romanov
===================================================================
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_tree.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_draw.c
b/source/blender/editors/space_outliner/outliner_draw.c
index b9744b0..3aaa116 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -453,7 +453,7 @@ static void namebutton_cb(bContext *C, void *tsep, char
*oldname)
TreeStoreElem *tselem = tsep;
if (ts && tselem) {
- TreeElement *te = outliner_find_tse(soops, tselem);
+ TreeElement *te = outliner_find_tree_element(&soops->tree,
tselem);
if (tselem->type == 0) {
test_idbutton(tselem->id->name); // library.c, unique
name and alpha sort
diff --git a/source/blender/editors/space_outliner/outliner_intern.h
b/source/blender/editors/space_outliner/outliner_intern.h
index 05e5d3c..f092046 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -167,6 +167,7 @@ void outliner_free_tree(ListBase *lb);
void outliner_cleanup_tree(struct SpaceOops *soops);
TreeElement *outliner_find_tse(struct SpaceOops *soops, TreeStoreElem *tse);
+TreeElement *outliner_find_tree_element(ListBase *lb, TreeStoreElem
*store_elem);
TreeElement *outliner_find_id(struct SpaceOops *soops, ListBase *lb, struct ID
*id);
struct ID *outliner_search_back(SpaceOops *soops, TreeElement *te, short
idcode);
diff --git a/source/blender/editors/space_outliner/outliner_tree.c
b/source/blender/editors/space_outliner/outliner_tree.c
index 273cf75..abc8277 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -197,7 +197,7 @@ void outliner_cleanup_tree(SpaceOops *soops)
}
/* Find specific item from the treestore */
-static TreeElement *outliner_find_tree_element(ListBase *lb, TreeStoreElem
*store_elem)
+TreeElement *outliner_find_tree_element(ListBase *lb, TreeStoreElem
*store_elem)
{
TreeElement *te, *tes;
for (te = lb->first; te; te = te->next) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
