[Bf-blender-cvs] [adf4d0e] alembic: Merge branch 'master' into alembic

[Sergey Sharybin]

Commit: adf4d0e3e307bef203104d49a92d7b0833be2856
Author: Sergey Sharybin
Date:   Wed Apr 29 14:00:07 2015 +0500
Branches: alembic
https://developer.blender.org/rBadf4d0e3e307bef203104d49a92d7b0833be2856

Merge branch 'master' into alembic

Conflicts:
	intern/cycles/blender/blender_sync.h

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



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

diff --cc intern/cycles/blender/blender_sync.h
index 8d2f324,89d93e1..6c4da1a
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@@ -83,13 -83,13 +83,13 @@@ 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);
- 	void sync_light(BL::Object b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::Object b_ob, Transform& tfm);
- 	void sync_background_light();
+ 	                                 Transform& tfm, uint layer_flag, float motion_time, bool hide_tris, bool *use_portal);
+ 	void sync_light(BL::Object b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::Object b_ob, Transform& tfm, bool *use_portal);
+ 	void sync_background_light(bool use_portal);
 -	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 */