Commit: 22754cf68737986b81977acc0ab4368aaca1ff15
Author: Campbell Barton
Date: Fri Nov 14 14:55:45 2014 +0100
Branches: master
https://developer.blender.org/rB22754cf68737986b81977acc0ab4368aaca1ff15
skip scene_armature_depsgraph_workaround when theres no armatures
===================================================================
M intern/cycles/blender/blender_sync.cpp
M source/blender/blenkernel/intern/scene.c
===================================================================
diff --git a/intern/cycles/blender/blender_sync.cpp
b/intern/cycles/blender/blender_sync.cpp
index bd3dc81..ee492dd 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 8b75682..073de21 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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
