[Bf-blender-cvs] [fd6015f9fdb] ui-asset-view-template: Merge branch 'master' into ui-asset-view-template

[Julian Eisel]

Commit: fd6015f9fdb3e3d59a3149098464e82145a1c74c
Author: Julian Eisel
Date:   Wed Mar 24 12:15:46 2021 +0100
Branches: ui-asset-view-template
https://developer.blender.org/rBfd6015f9fdb3e3d59a3149098464e82145a1c74c

Merge branch 'master' into ui-asset-view-template

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index bc01d328370,00f4c49fda9..ac06886b3c9
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1916,14 -1916,12 +1917,21 @@@ void blo_do_versions_290(FileData *fd, 
     */
    {
      /* Keep this block, even when empty. */
+ 
+     if (!DNA_struct_elem_find(fd->filesdna, "Light", "float", "diff_fac")) {
+       LISTBASE_FOREACH (Light *, light, &bmain->lights) {
+         light->diff_fac = 1.0f;
+         light->volume_fac = 1.0f;
+       }
+     }
    }
 +
 +  {
 +    if (!DNA_struct_elem_find(
 +            fd->filesdna, "WorkSpace", "AssetLibraryReference", "active_asset_library")) {
 +      LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspaces) {
 +        BKE_asset_library_reference_init_default(&workspace->active_asset_library);
 +      }
 +    }
 +  }
  }
diff --cc source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
index 6286357d6c6,72b05dcce70..9c48e7c44ba
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
@@@ -252,14 -247,12 +247,14 @@@ static void geo_node_mesh_primitive_con
    const float radius_top = params.extract_input<float>("Radius Top");
    const float radius_bottom = params.extract_input<float>("Radius Bottom");
    const float depth = params.extract_input<float>("Depth");
-   const float3 location = params.extract_input<float3>("Location");
-   const float3 rotation = params.extract_input<float3>("Rotation");
  
    Mesh *mesh = create_cylinder_or_cone_mesh(
-       location, rotation, radius_top, radius_bottom, depth, verts_num, fill_type);
+       radius_top, radius_bottom, depth, verts_num, fill_type);
+ 
+   BKE_mesh_translate(mesh, float3(0.0f, 0.0f, depth * 0.5f), false);
  
 +  BKE_mesh_translate(mesh, float3(0.0f, 0.0f, depth * 0.5f), false);
 +
    params.set_output("Geometry", GeometrySet::create_with_mesh(mesh));
  }