diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-14 16:55:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-14 16:55:45 +0300 |
| commit | 22754cf68737986b81977acc0ab4368aaca1ff15 (patch) | |
| tree | 83c958588318cef25232bf279c27dbd70abd2202 | |
| parent | 8d5d6de7615c79a79a0ab3fa95319650ebe89206 (diff) | |
skip scene_armature_depsgraph_workaround when theres no armatures
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index bd3dc816657..ee492dd00e4 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -517,7 +517,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use /* color managagement */ #ifdef GLEW_MX /* When using GLEW MX we need to check whether we've got an OpenGL - * context for crrent window. This is because command line rendering + * context for current window. This is because command line rendering * doesn't have OpenGL context actually. */ if(glewGetContext() != NULL) diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 8b75682939d..073de219649 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1261,7 +1261,7 @@ static void scene_depsgraph_hack(EvaluationContext *eval_ctx, Scene *scene, Scen static void scene_armature_depsgraph_workaround(Main *bmain) { Object *ob; - if (!DAG_id_type_tagged(bmain, ID_OB)) { + if (BLI_listbase_is_empty(&bmain->armature) || !DAG_id_type_tagged(bmain, ID_OB)) { return; } for (ob = bmain->object.first; ob; ob = ob->id.next) { |