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
@@@ -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"
@@@ -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);
        }
  }
  
  #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"
  #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"
  
  #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"
  
@@@ -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"