[Bf-blender-cvs] [6860bfb] gooseberry: Sanity check for dupligroup caching functions.

Lukas Tönne noreply at git.blender.org
Mon Mar 23 13:03:49 CET 2015


Commit: 6860bfbe35aad8ecbc46a7601ab95bb35378a234
Author: Lukas Tönne
Date:   Tue Mar 17 16:28:31 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB6860bfbe35aad8ecbc46a7601ab95bb35378a234

Sanity check for dupligroup caching functions.

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

M	source/blender/blenkernel/intern/cache_library.c

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

diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index 6c535e7..b0c82ba 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -1213,6 +1213,9 @@ bool BKE_cache_test_dupligroup(Main *bmain, eCacheLibrary_EvalMode eval_mode, st
 {
 	CacheLibrary *cachelib;
 	
+	if (!dupgroup)
+		return false;
+	
 	FOREACH_CACHELIB_READ(bmain, cachelib, eval_mode) {
 		if (cachelib->group == dupgroup) {
 			return true;
@@ -1225,6 +1228,9 @@ bool BKE_cache_read_dupligroup(Main *bmain, Scene *scene, float frame, eCacheLib
 {
 	CacheLibrary *cachelib;
 	
+	if (!dupgroup)
+		return false;
+	
 	FOREACH_CACHELIB_READ(bmain, cachelib, eval_mode) {
 		if (cachelib->group == dupgroup) {
 			char filename[FILE_MAX];




More information about the Bf-blender-cvs mailing list