Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 17 Nov 2017 14:00:27 +0000 (15:00 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 17 Nov 2017 14:00:55 +0000 (15:00 +0100)
1  2 
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/include/ED_uvedit.h
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/intern/rna_particle.c

index 8a742735a0623e8d6610f98178edb6e0986263e9,ce7632436020b563b2704f43d97a5b0890fc54c8..93a870963698989b005ff1b1e995d26a51759d5d
@@@ -1618,8 -1644,9 +1641,8 @@@ void ED_uvedit_unwrap_cube_project(BMes
        BMFace *efa;
        BMLoop *l;
        BMIter iter, liter;
 -      /* MTexPoly *tf; */ /* UNUSED */
        MLoopUV *luv;
-       float *loc, dx, dy;
+       float loc[3];
        int cox, coy;
  
        int cd_loop_uv_offset;
@@@ -1671,10 -1708,13 +1704,13 @@@ static int cube_project_exec(bContext *
                return OPERATOR_CANCELLED;
        }
  
-       ED_uvedit_unwrap_cube_project(obedit, em->bm, cube_size, true);
+       uv_map_transform_center(scene, v3d, center, obedit, em);
+       ED_uvedit_unwrap_cube_project(em->bm, cube_size, true, center);
        uv_map_clip_correct(scene, obedit, em, op);
  
 -      DAG_id_tag_update(obedit->data, 0);
 +      DEG_id_tag_update(obedit->data, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
  
        return OPERATOR_FINISHED;
index b4a3fcac18f5789bb1c132778877ef99cc11edc4,53fe84707d1b68b10230c633d867d4dc5a2dcea0..0c85799fce76820f250d47c2ddb34e2f0babe091
@@@ -683,6 -675,7 +683,7 @@@ static void rna_Particle_reset_dependen
  static void rna_Particle_change_type(Main *bmain, Scene *scene, PointerRNA *ptr)
  {
        particle_recalc(bmain, scene, ptr, PSYS_RECALC_RESET | PSYS_RECALC_TYPE);
 -      DAG_relations_tag_update(bmain);
++      DEG_relations_tag_update(bmain);
  }
  
  static void rna_Particle_change_physics(Main *bmain, Scene *scene, PointerRNA *ptr)
@@@ -777,11 -770,13 +778,14 @@@ static void rna_Particle_hair_dynamics_
                psys->clmd->coll_parms->flags &= ~CLOTH_COLLSETTINGS_FLAG_SELF;
                rna_Particle_redo(bmain, scene, ptr);
        }
-       else
+       else {
                WM_main_add_notifier(NC_OBJECT | ND_PARTICLE | NA_EDITED, NULL);
+       }
  
 -      DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 -      DAG_relations_tag_update(bmain);
 +      DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
++      DEG_relations_tag_update(bmain);
  }
++
  static PointerRNA rna_particle_settings_get(PointerRNA *ptr)
  {
        ParticleSystem *psys = (ParticleSystem *)ptr->data;