diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 13:06:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 13:06:17 +0400 |
| commit | b366813e37088e96539bf1f9b76ec8b33cb5cd72 (patch) | |
| tree | b1be19dece8e8c4c7e7909c76c3fc83f100b11d4 /source/blender/nodes | |
| parent | c955272ec52c59bf0e432609b21c40c048fd6e53 (diff) | |
bugfix
* ntreeCompositExecTree accessed 'ntree' before NULL check.
* BM_face_triangulate accessed 'f' before NULL check.
also quiet warning in BKE_text_to_curve() and add a check for BMesh bridge loops so it knows quicker if it can copy loop data or not.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 52dc364e590..8257b850010 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -566,10 +566,12 @@ void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview) ListBase threads; ThreadData thdata; int totnode, curnode, rendering= 1, n; - bNodeTreeExec *exec= ntree->execdata; - + bNodeTreeExec *exec; + if(ntree==NULL) return; - + + exec = ntree->execdata; + if(do_preview) ntreeInitPreview(ntree, 0, 0); |