[Bf-blender-cvs] [f3a434c] gooseberry: Merge branch 'cycles_memory_experiments' into gooseberry

[Sergey Sharybin]

Commit: f3a434c3212d84d69938edd2f40667627692db14
Author: Sergey Sharybin
Date:   Mon Jun 8 16:08:10 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBf3a434c3212d84d69938edd2f40667627692db14

Merge branch 'cycles_memory_experiments' into gooseberry

Conflicts:
	intern/cycles/blender/blender_object.cpp
	intern/cycles/blender/blender_sync.h

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



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

diff --cc intern/cycles/blender/blender_mesh.cpp
index 21282b5,ff4dab6..3fa80a8
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@@ -761,10 -718,10 +785,10 @@@ Mesh *BlenderSync::sync_mesh(BL::Objec
  			}
  
  			if(render_layer.use_hair)
 -				sync_curves(mesh, b_mesh, b_ob, false);
 +				sync_curves(mesh, b_mesh, b_parent, false, 0, b_dupli_ob);
  
  			if(can_free_caches) {
- 				b_ob.cache_release();
+ 				b_ob.cache_release(false);
  			}
  
  			/* free derived mesh */
diff --cc source/blender/blenkernel/intern/object.c
index 9a9f176,d0f8f83..d8f580a
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -343,11 -337,9 +344,11 @@@ void BKE_object_free_derived_caches(Obj
  	}
  	
  	BKE_object_free_curve_cache(ob);
 +	
 +	BKE_object_dupli_cache_clear(ob);
  }
  
- void BKE_object_free_caches(Object *object)
+ void BKE_object_free_caches(Object *object, bool free_smoke_sim)
  {
  	ModifierData *md;
  	short update_flag = 0;