[Bf-blender-cvs] [94c0d3a4cc9] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: 94c0d3a4cc9a3a002eee666f8fb8baad2d9ff31c
Author: YimingWu
Date:   Sun Sep 27 07:56:10 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB94c0d3a4cc9a3a002eee666f8fb8baad2d9ff31c

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

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



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

diff --cc build_files/cmake/config/blender_full.cmake
index 2547a7b6db4,c5ed59dfaa5..84e7492b1f8
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@@ -15,15 -17,10 +17,11 @@@ set(WITH_CYCLES_EMBREE       ON  CACHE 
  set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
  set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
  set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
- set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
- set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
- set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
- set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
  set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
 +set(WITH_LINEART             ON  CACHE BOOL "" FORCE)
  set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
- set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
  set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
+ set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
  set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
  set(WITH_IMAGE_DDS           ON  CACHE BOOL "" FORCE)
  set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
diff --cc build_files/cmake/config/blender_lite.cmake
index 292d4f25a6f,f53bdaac41e..eda7095fb46
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@@ -20,15 -22,10 +22,11 @@@ set(WITH_CYCLES_OSL          OFF CACHE 
  set(WITH_CYCLES_DEVICE_OPTIX OFF CACHE BOOL "" FORCE)
  set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
  set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
- set(WITH_GMP                 OFF CACHE BOOL "" FORCE)
- set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
- set(WITH_LLVM                OFF CACHE BOOL "" FORCE)
- set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
  set(WITH_FREESTYLE           OFF CACHE BOOL "" FORCE)
 +set(WITH_LINEART             OFF CACHE BOOL "" FORCE)
  set(WITH_GMP                 OFF CACHE BOOL "" FORCE)
- set(WITH_IK_SOLVER           OFF CACHE BOOL "" FORCE)
  set(WITH_IK_ITASC            OFF CACHE BOOL "" FORCE)
+ set(WITH_IK_SOLVER           OFF CACHE BOOL "" FORCE)
  set(WITH_IMAGE_CINEON        OFF CACHE BOOL "" FORCE)
  set(WITH_IMAGE_DDS           OFF CACHE BOOL "" FORCE)
  set(WITH_IMAGE_HDR           OFF CACHE BOOL "" FORCE)
diff --cc build_files/cmake/config/blender_release.cmake
index 1ed3a1439f8,e7e64678b40..3540e131f11
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@@ -16,12 -18,7 +18,8 @@@ set(WITH_CYCLES_EMBREE       ON  CACHE 
  set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
  set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
  set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
- set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
- set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
- set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
- set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
  set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
 +set(WITH_LINEART             ON  CACHE BOOL "" FORCE)
  set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
  set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
  set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
diff --cc source/blender/editors/space_buttons/buttons_context.c
index 752d76d17c8,410197da5da..f65be2f0abd
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@@ -159,35 -151,11 +151,34 @@@ static bool buttons_context_path_world(
    }
  
    /* no path to a world possible */
-   return 0;
+   return false;
  }
  
 +static int buttons_context_path_collection(ButsContextPath *path, wmWindow *window)
 +{
 +  PointerRNA *ptr = &path->ptr[path->len - 1];
 +
 +  /* if we already have a (pinned) collection, we're done */
 +  if (RNA_struct_is_a(ptr->type, &RNA_Collection)) {
 +    return 1;
 +  }
 +  /* if we have a view layer, use the view layer's active collection */
 +  else if (buttons_context_path_view_layer(path, window)) {
 +    ViewLayer *view_layer = path->ptr[path->len - 1].data;
 +    Collection *c = view_layer->active_collection->collection;
 +    if (c) {
 +      RNA_id_pointer_create(&c->id, &path->ptr[path->len]);
 +      path->len++;
 +      return 1;
 +    }
 +  }
 +
 +  /* no path to a collection possible */
 +  return 0;
 +}
 +
  static bool buttons_context_path_linestyle(ButsContextPath *path, wmWindow *window)
  {
-   FreestyleLineStyle *linestyle;
    PointerRNA *ptr = &path->ptr[path->len - 1];
  
    /* if we already have a (pinned) linestyle, we're done */