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

[Sergey Sharybin]

Commit: a13952e84e7e05b0d4bae5702f90e7dbb4bd1dd8
Author: Sergey Sharybin
Date:   Fri Apr 10 20:56:44 2015 +0500
Branches: gooseberry
https://developer.blender.org/rBa13952e84e7e05b0d4bae5702f90e7dbb4bd1dd8

Merge branch 'cycles_memory_experiments' into gooseberry

Conflicts:
	intern/cycles/blender/blender_sync.h

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



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

diff --cc intern/cycles/blender/blender_sync.h
index 8d2f324,04c26ef..f9d22d3
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@@ -83,13 -83,20 +83,20 @@@ private
  	void sync_curve_settings();
  
  	void sync_nodes(Shader *shader, BL::ShaderNodeTree b_ntree);
 -	Mesh *sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tris);
 -	void sync_curves(Mesh *mesh, BL::Mesh b_mesh, BL::Object b_ob, bool motion, int time_index = 0);
 +	Mesh *sync_mesh(BL::Object b_parent, bool object_updated, bool hide_tris, BL::DupliObject b_dupli_ob = PointerRNA_NULL);
 +	void sync_curves(Mesh *mesh, BL::Mesh b_mesh, BL::Object b_parent, bool motion, int time_index = 0, BL::DupliObject b_dupli_ob = PointerRNA_NULL);
- 	Object *sync_object(BL::Object b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::DupliObject b_dupli_ob,
- 	                                 Transform& tfm, uint layer_flag, float motion_time, bool hide_tris);
+ 	Object *sync_object(BL::Object b_parent,
+ 	                    int persistent_id[OBJECT_PERSISTENT_ID_SIZE],
+ 	                    BL::DupliObject b_dupli_ob,
+ 	                    Transform& tfm,
+ 	                    uint layer_flag,
+ 	                    float motion_time,
+ 	                    bool hide_tris,
+ 	                    bool use_camera_cull,
+ 	                    float camera_cull_margin);
  	void sync_light(BL::Object b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::Object b_ob, Transform& tfm);
  	void sync_background_light();
 -	void sync_mesh_motion(BL::Object b_ob, Object *object, float motion_time);
 +	void sync_mesh_motion(BL::Object b_parent, Object *object, float motion_time, BL::DupliObject b_dupli_ob = PointerRNA_NULL);
  	void sync_camera_motion(BL::Object b_ob, float motion_time);
  
  	/* particles */