Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Apr 2018 12:19:51 +0000 (14:19 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Apr 2018 12:19:51 +0000 (14:19 +0200)
13 files changed:
1  2 
CMakeLists.txt
build_files/cmake/macros.cmake
source/blender/blenkernel/intern/displist.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/mesh/editmesh_extrude.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/particle_edit_undo.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/sculpt_paint/paint_image_undo.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/editors/space_action/action_buttons.c
source/blender/python/intern/bpy_rna.c

diff --cc CMakeLists.txt
Simple merge
Simple merge
index 393fa475a9b665588b30c908659460ab2813cfbe,41e8a9633830abcfdbe3ad012c156612a2879a16..3382847c8a4eff7931cfc935460f05d117dd9517
@@@ -43,7 -43,7 +43,6 @@@
  
  #include "BKE_DerivedMesh.h"
  #include "BKE_context.h"
- #include "BKE_main.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_mesh.h"
  #include "BKE_mesh_mapping.h"
  #include "BKE_report.h"
index 9deae22e4e1c45710bc9257efc0fee8d093b4f6f,bdffaf313847232b8f510dd4f3c38288bb4cf478..14bcba3416f05f04cbf8ac91c59182399b510ed0
@@@ -4436,7 -4376,7 +4436,8 @@@ void PE_create_particle_edit
                recalc_lengths(edit);
                if (psys && !cache)
                        recalc_emitter_field(ob, psys);
 -              PE_update_object(scene, ob, 1);
++
 +              PE_update_object(eval_ctx, scene, ob, 1);
        }
  }
  
index 1264800afc86694da4cf3a056be969f2730f76ae,ef0a2711fdd9b022dcf3a7fe1773e92c7e8bf999..5199b1c54fac1359c6a07d861a36b133093a1d00
  #include "BLI_string.h"
  #include "BLI_utildefines.h"
  
- #include "BKE_global.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_particle.h"
  #include "BKE_pointcache.h"
  #include "BKE_context.h"
- #include "BKE_main.h"
  #include "BKE_undo_system.h"
  
 +#include "DEG_depsgraph.h"
 +
  #include "ED_object.h"
  #include "ED_particle.h"
  #include "ED_physics.h"
index 5308ef0fae8de10a6c54fe20b1e7e86cf88fc1e4,554ddf921509250639bf05823788071dfabee924..5184f5cc75765667cfec60bdfa13ac2dfc030a68
  #include "IMB_imbuf_types.h"
  
  #include "BKE_context.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_image.h"
  #include "BKE_main.h"
- #include "BKE_global.h"
  #include "BKE_undo_system.h"
  
 +#include "DEG_depsgraph.h"
 +
  #include "ED_paint.h"
+ #include "ED_undo.h"
  
  #include "GPU_draw.h"
  
index 7158c0fc88f6e7c0c616d0daff15b4a8d49c7847,e90d2b58c0c8b7283ede928e76d814937df725b0..694e1f048f560e087e1a60e29d22119671abd7e5
  #include "BKE_key.h"
  #include "BKE_mesh.h"
  #include "BKE_subsurf.h"
- #include "DEG_depsgraph.h"
- #include "BKE_global.h"
- #include "BKE_main.h"
  #include "BKE_undo_system.h"
  
++#include "DEG_depsgraph.h"
++
  #include "WM_api.h"
  #include "WM_types.h"
  
index 82768bedc953f776560542a0e11e42b7421091ef,ba6cef38acd0281b6dfe70e235ccdd567809d7fd..3ba59b3be7566b340311d702fcc4849cee948888
@@@ -48,8 -48,8 +48,7 @@@
  
  #include "BKE_context.h"
  #include "BKE_curve.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_fcurve.h"
- #include "BKE_main.h"
  #include "BKE_screen.h"
  #include "BKE_unit.h"