[Bf-blender-cvs] [3da9bee809f] lanpr-under-gp: LineArt: compiler error fixes.

YimingWu noreply at git.blender.org
Wed Nov 4 09:26:02 CET 2020


Commit: 3da9bee809f8d3095fb79404b53fdf36d5323434
Author: YimingWu
Date:   Wed Nov 4 16:20:10 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB3da9bee809f8d3095fb79404b53fdf36d5323434

LineArt: compiler error fixes.

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

M	source/blender/blenkernel/intern/scene.c
M	source/blender/makesrna/intern/rna_object.c
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 425f8eb2dc4..b2ae8ca306a 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -347,9 +347,6 @@ static void scene_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const int
     scene_dst->preview = NULL;
   }
 
-  /*  Line Art  data */
-  BKE_lineart_copy_data(scene_src, scene_dst);
-
   BKE_scene_copy_data_eevee(scene_dst, scene_src);
 }
 
@@ -447,9 +444,6 @@ static void scene_free_data(ID *id)
     scene->display.shading.prop = NULL;
   }
 
-  /* Line Art data */
-  BKE_lineart_free_everything(scene);
-
   /* These are freed on doversion. */
   BLI_assert(scene->layer_properties == NULL);
 }
@@ -1136,9 +1130,6 @@ Scene *BKE_scene_duplicate(Main *bmain, Scene *sce, eSceneCopyMethod type)
     BKE_sequencer_editing_free(sce_copy, true);
   }
 
-  /*  Line Art  data */
-  BKE_lineart_copy_data(sce, sce_copy);
-
   return sce_copy;
 }
 
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 5baecc9e27a..3bf91751ee8 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -36,6 +36,7 @@
 #include "DNA_shader_fx_types.h"
 #include "DNA_workspace_types.h"
 
+#include "BLI_math.h"
 #include "BLI_utildefines.h"
 
 #include "BLT_translation.h"
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 3e4905e5b79..3c0441715b5 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7534,7 +7534,7 @@ static void rna_def_scene_lineart(BlenderRNA *brna)
 
   prop = RNA_def_property(srna, "baking_skip", PROP_INT, PROP_NONE);
   RNA_def_property_ui_text(prop, "Skip", "Number of frames to skip per baked frame");
-  RNA_def_property_ui_range(prop, 0, 1000);
+  RNA_def_property_ui_range(prop, 0, 100, 1, 1);
 }
 
 void RNA_def_scene(BlenderRNA *brna)



More information about the Bf-blender-cvs mailing list