Commit: d0978103aefab710c9d433a5a0a32b40b5e287eb
Author: Sybren A. Stüvel
Date: Fri Feb 20 08:41:21 2015 +0100
Branches: master
https://developer.blender.org/rBd0978103aefab710c9d433a5a0a32b40b5e287eb
Revert "Cast result of rna_RenderSettings_use_game_engine_get to {0, 1}"
There are more flags that trigger this assertion, so I want to discuss
an appropriate way to fix it before changing them all.
This reverts commit b1191e5caf1a888bfad2185ed41db2e91fbf46e2.
===================================================================
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_scene.c
b/source/blender/makesrna/intern/rna_scene.c
index 617758f..205cd0c 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1245,7 +1245,7 @@ static int
rna_RenderSettings_use_game_engine_get(PointerRNA *ptr)
for (type = R_engines.first; type; type = type->next)
if (STREQ(type->idname, rd->engine))
- return !!(type->flag & RE_GAME);
+ return (type->flag & RE_GAME);
return 0;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
