[Bf-blender-cvs] [b4f849b] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

Dalai Felinto noreply at git.blender.org
Tue Oct 25 17:09:51 CEST 2016


Commit: b4f849b9c645125946d688262c2f1f9dceb83899
Author: Dalai Felinto
Date:   Tue Oct 25 11:18:41 2016 +0000
Branches: blender2.8
https://developer.blender.org/rBb4f849b9c645125946d688262c2f1f9dceb83899

Merge remote-tracking branch 'origin/master' into blender2.8

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



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

diff --cc intern/cycles/blender/blender_sync.h
index 8caa807,9a01b4f..2fad7d5
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@@ -157,9 -162,10 +157,9 @@@ private
  	id_map<ObjectKey, Object> object_map;
  	id_map<void*, Mesh> mesh_map;
  	id_map<ObjectKey, Light> light_map;
 -	id_map<ParticleSystemKey, ParticleSystem> particle_system_map;
  	set<Mesh*> mesh_synced;
  	set<Mesh*> mesh_motion_synced;
- 	std::set<float> motion_times;
+ 	set<float> motion_times;
  	void *world_map;
  	bool world_recalc;
  
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 8820c2f,c23bfb1..b483402
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -1467,8 -1546,9 +1547,10 @@@ static bool gp_session_initdata(bContex
  	bGPDpalettecolor *palcolor = p->palettecolor;
  	bGPdata *pdata = p->gpd;
  	copy_v4_v4(pdata->scolor, palcolor->color);
 +	copy_v4_v4(pdata->sfill, palcolor->fill);
  	pdata->sflag = palcolor->flag;
+ 	/* lock axis */
+ 	p->lock_axis = ts->gp_sculpt.lock_axis;
  
  	return 1;
  }




More information about the Bf-blender-cvs mailing list