[Bf-blender-cvs] [79a342952f3] temp-lineart-contained: Merge remote-tracking branch 'origin/master' into temp-lineart-contained

[YimingWu]

Commit: 79a342952f3c258e6483e4a8e3d90371af15192e
Author: YimingWu
Date:   Tue Jul 27 13:40:20 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB79a342952f3c258e6483e4a8e3d90371af15192e

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 1e3d3509c10,e46073ba0de..777f6eac669
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -29,9 -29,8 +29,10 @@@
  #include "DNA_armature_types.h"
  #include "DNA_brush_types.h"
  #include "DNA_collection_types.h"
+ #include "DNA_curve_types.h"
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_modifier_types.h"
 +#include "DNA_lineart_types.h"
  #include "DNA_listBase.h"
  #include "DNA_material_types.h"
  #include "DNA_modifier_types.h"
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 0c0ecd949f6,8228915c6a8..f9c7ab5474a
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@@ -774,10 -674,8 +767,10 @@@ static void panelRegister(ARegionType *
        region_type, "chaining", "Chaining", NULL, chaining_panel_draw, panel_type);
    gpencil_modifier_subpanel_register(
        region_type, "vgroup", "Vertex Weight Transfer", NULL, vgroup_panel_draw, panel_type);
 +  gpencil_modifier_subpanel_register(
 +      region_type, "composition", "Composition", NULL, composition_panel_draw, panel_type);
    gpencil_modifier_subpanel_register(
-       region_type, "baking", "Baking", NULL, baking_panel_draw, panel_type);
+       region_type, "bake", "Bake", NULL, bake_panel_draw, panel_type);
  }
  
  GpencilModifierTypeInfo modifierType_Gpencil_Lineart = {
diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index d3df6171afb,83abac201d0..5a3997a107e
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@@ -2231,8 -2120,9 +2231,8 @@@ static void lineart_main_load_geometrie
        continue;
      }
  
 -    Object *use_ob = DEG_get_evaluated_object(depsgraph, ob);
      /* Prepare the matrix used for transforming this specific object (instance). This has to be
-      * done before mesh boundbox check because the function needs that.  */
+      * done before mesh boundbox check because the function needs that. */
      mul_m4db_m4db_m4fl_uniq(obi->model_view_proj, rb->view_projection, ob->obmat);
      mul_m4db_m4db_m4fl_uniq(obi->model_view, rb->view, ob->obmat);