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

[YimingWu]

Commit: fb52b3b69de99c59113dcdc9d1d72ab83228630e
Author: YimingWu
Date:   Thu Oct 22 11:08:53 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBfb52b3b69de99c59113dcdc9d1d72ab83228630e

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

# Conflicts:
#	release/scripts/addons
#	release/scripts/addons_contrib

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 23cac4b74d0,00085cb7d59..25b32e08aab
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -883,18 -883,38 +883,48 @@@ void blo_do_versions_290(FileData *fd, 
          part->phystype = PART_PHYS_NO;
        }
      }
 +
 +    for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
 +      if (!DNA_struct_find(fd->filesdna, "SceneLineart")) {
 +        for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
 +          scene->lineart.crease_threshold = 145.0f; /* in degrees. */
 +          scene->lineart.line_types |= LRT_EDGE_FLAG_ALL_TYPE;
 +          scene->lineart.flags |= (LRT_ALLOW_DUPLI_OBJECTS | LRT_REMOVE_DOUBLES);
 +        }
 +      }
 +    }
    }
  
+   if (!MAIN_VERSION_ATLEAST(bmain, 291, 9)) {
+     /* Remove options of legacy UV/Image editor */
+     for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+       LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+         LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+           switch (sl->spacetype) {
+             case SPACE_IMAGE: {
+               SpaceImage *sima = (SpaceImage *)sl;
+               sima->flag &= ~(SI_FLAG_UNUSED_20);
+               break;
+             }
+           }
+         }
+       }
+     }
+ 
+     if (!DNA_struct_elem_find(fd->filesdna, "FluidModifierData", "float", "fractions_distance")) {
+       LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+         LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
+           if (md->type == eModifierType_Fluid) {
+             FluidModifierData *fmd = (FluidModifierData *)md;
+             if (fmd->domain) {
+               fmd->domain->fractions_distance = 0.5;
+             }
+           }
+         }
+       }
+     }
+   }
+ 
    /**
     * Versioning code until next subversion bump goes here.
     *
diff --cc source/blender/editors/object/CMakeLists.txt
index e3640b91ed4,2f72f563e68..64da60dd76c
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@@ -86,12 -86,9 +86,13 @@@ if(WITH_INTERNATIONAL
    add_definitions(-DWITH_INTERNATIONAL)
  endif()
  
 +if(WITH_LINEART)
 +  add_definitions(-DWITH_LINEART)
 +endif()
 +  
  if(WITH_EXPERIMENTAL_FEATURES)
-   add_definitions(-DWITH_PARTICLE_NODES)
+   add_definitions(-DWITH_GEOMETRY_NODES)
+   add_definitions(-DWITH_POINT_CLOUD)
    add_definitions(-DWITH_HAIR_NODES)
  endif()