[Bf-blender-cvs] [92429ef] depsgraph_refactor: Depsgraph: Fix one more use-after-free issue

[Sergey Sharybin]

Commit: 92429efe19d7f9807ff620ec224a55bea1e534a4
Author: Sergey Sharybin
Date:   Thu Dec 18 19:57:14 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB92429efe19d7f9807ff620ec224a55bea1e534a4

Depsgraph: Fix one more use-after-free issue

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

M       source/blender/depsgraph/intern/depsgraph.cpp

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

diff --git a/source/blender/depsgraph/intern/depsgraph.cpp 
b/source/blender/depsgraph/intern/depsgraph.cpp
index 6cd6a64..6e7c0b4 100644
--- a/source/blender/depsgraph/intern/depsgraph.cpp
+++ b/source/blender/depsgraph/intern/depsgraph.cpp
@@ -326,13 +326,13 @@ void Depsgraph::add_id_tag(const ID *id)
 
 void Depsgraph::clear_all_nodes()
 {
+       clear_id_nodes();
+       clear_subgraph_nodes();
+       id_hash.clear();
        if (this->root_node) {
                OBJECT_GUARDED_DELETE(this->root_node, RootDepsNode);
                root_node = NULL;
        }
-       clear_id_nodes();
-       clear_subgraph_nodes();
-       id_hash.clear();
 }
 
 /* ************************************************** */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs