[Bf-blender-cvs] [4fe067b8541] soc-2019-npr: Merge branch 'master' into soc-2019-npr

[YimingWu]

Commit: 4fe067b8541505520363622b26d2dc400a280504
Author: YimingWu
Date:   Wed Jul 31 15:55:04 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB4fe067b8541505520363622b26d2dc400a280504

Merge branch 'master' into soc-2019-npr

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



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

diff --cc source/blender/draw/CMakeLists.txt
index a6ec33ec9d1,016cd628969..6e508684210
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -126,11 -126,8 +126,13 @@@ set(SR
    engines/gpencil/gpencil_engine.h
    engines/gpencil/gpencil_render.c
    engines/gpencil/gpencil_shader_fx.c
 +	engines/lanpr/lanpr_dpix.c
 +	engines/lanpr/lanpr_engine.c
 +	engines/lanpr/lanpr_snake.c
 +	engines/lanpr/lanpr_cpu.c
 +  engines/lanpr/lanpr_chain_draw.c
+   engines/select/select_engine.c
+   engines/select/select_draw_utils.c
  
    DRW_engine.h
    intern/DRW_render.h
@@@ -155,8 -152,8 +157,10 @@@
    engines/external/external_engine.h
    engines/workbench/workbench_engine.h
    engines/workbench/workbench_private.h
 +	engines/lanpr/lanpr_all.h
 +  engines/lanpr/lanpr_access.h
+   engines/select/select_engine.h
+   engines/select/select_private.h
  )
  
  set(LIB
diff --cc source/blender/draw/intern/draw_manager.c
index 4f1ecc55acc,af61063335b..a457d82e1d3
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -88,8 -88,8 +88,9 @@@
  #include "engines/basic/basic_engine.h"
  #include "engines/workbench/workbench_engine.h"
  #include "engines/external/external_engine.h"
 +#include "engines/lanpr/lanpr_all.h"
  #include "engines/gpencil/gpencil_engine.h"
+ #include "engines/select/select_engine.h"
  
  #include "GPU_context.h"
  
diff --cc source/blender/editors/gpencil/gpencil_edit.c
index e93628310b3,0fc051e4756..541419fc31d
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -3368,7 -3368,7 +3370,6 @@@ typedef enum eGP_ReprojectModes 
    /* Reprojected on 3D cursor orientation */
    GP_REPROJECT_CURSOR,
  } eGP_ReprojectModes;
--
  static int gp_strokes_reproject_exec(bContext *C, wmOperator *op)
  {
    bGPdata *gpd = ED_gpencil_data_get_active(C);
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index c6292117a3f,e0139eac6b2..a97ca6e4160
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@@ -85,13 -85,24 +85,28 @@@ static bool dependsOnTime(GpencilModifi
    return (mmd->flag & GP_NOISE_USE_RANDOM) != 0;
  }
  
+ /* Get the lower number of frame for all layers. */
+ static int get_lower_frame(bGPdata *gpd)
+ {
+   int init = 99999;
+   for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
+     if (gpl->frames.first) {
+       bGPDframe *gpf = gpl->frames.first;
+       if (gpf->framenum < init) {
+         init = gpf->framenum;
+       }
+     }
+   }
+   return init;
+ }
+ 
  /* aply noise effect based on stroke direction */
 -static void deformStroke(
 -    GpencilModifierData *md, Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDstroke *gps)
 +static void deformStroke(GpencilModifierData *md,
 +                         Depsgraph *depsgraph,
 +                         Object *ob,
 +                         bGPDlayer *gpl,
 +                         bGPDframe *UNUSED(gpf),
 +                         bGPDstroke *gps)
  {
    NoiseGpencilModifierData *mmd = (NoiseGpencilModifierData *)md;
    bGPDspoint *pt0, *pt1;
diff --cc source/blender/makesdna/DNA_collection_types.h
index 33bdaf13bec,af543864536..1cb756f73e0
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@@ -100,11 -57,10 +100,13 @@@ typedef struct Collection 
    float instance_offset[3];
  
    short flag;
-   char _pad[6];
+   /* Runtime-only, always cleared on file load. */
+   short tag;
+   char _pad[4];
  
 +  /** LANPR engine specific */
 +  CollectionLANPR lanpr;
 +
    /* Runtime. Cache of objects in this collection and all its
     * children. This is created on demand when e.g. some physics
     * simulation needs it, we don't want to have it for every