Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Tue, 25 Oct 2016 11:18:41 +0000 (11:18 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 25 Oct 2016 11:18:41 +0000 (11:18 +0000)
1  2 
intern/cycles/blender/blender_sync.h
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/context.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/object/object_relations.c
source/blender/editors/screen/screen_edit.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_sculpt_paint.c

index 8caa807093915b40c324bf6f0d897dc22ada0cf8,9a01b4f2b6eea9c7c724b2fcb41c9de9ad22da30..2fad7d5fe717840b31d67f008c04635da153a944
@@@ -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;
  
index 8820c2fa3a422c638ffe368c45f64cab029a8d53,c23bfb1ff607443a50362cbd2443ce7541ec26c2..b483402d6c83799fe14a12c853cc43252c35e08c
@@@ -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;
  }