[Bf-blender-cvs] [ca572e99708] blender-v2.82-release: Cleanup: fix compiler warnings related to deprecated members

Brecht Van Lommel noreply at git.blender.org
Tue Jan 28 18:27:40 CET 2020


Commit: ca572e99708e1c59067fbeea09f2feca777caff9
Author: Brecht Van Lommel
Date:   Tue Jan 28 18:19:44 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBca572e99708e1c59067fbeea09f2feca777caff9

Cleanup: fix compiler warnings related to deprecated members

For Freestyle, it helps to move the struct copy from C++ to C, where the
compiler knows that copying deprecated members is ok.

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

M	release/datafiles/userdef/userdef_default.c
M	source/blender/blenkernel/BKE_scene.h
M	source/blender/blenkernel/intern/scene.c
M	source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M	source/blender/makesdna/DNA_object_defaults.h

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

diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c
index f6573873dd5..09ce29200b3 100644
--- a/release/datafiles/userdef/userdef_default.c
+++ b/release/datafiles/userdef/userdef_default.c
@@ -108,7 +108,6 @@ const UserDef U_default = {
     .keyconfigstr = "blender",
     .undosteps = 32,
     .undomemory = 0,
-    .gpu_viewport_quality = 0.6,
     .gp_manhattendist = 1,
     .gp_euclideandist = 2,
     .gp_eraser = 25,
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 51abc7390b8..40b4883349d 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -173,6 +173,8 @@ bool BKE_scene_uses_blender_eevee(const struct Scene *scene);
 bool BKE_scene_uses_blender_workbench(const struct Scene *scene);
 bool BKE_scene_uses_cycles(const struct Scene *scene);
 
+void BKE_scene_copy_data_eevee(struct Scene *sce_dst, const struct Scene *sce_src);
+
 void BKE_scene_disable_color_management(struct Scene *scene);
 bool BKE_scene_check_color_management_enabled(const struct Scene *scene);
 bool BKE_scene_check_rigidbody_active(const struct Scene *scene);
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 2fda6cfb43b..86b15641f81 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -351,6 +351,13 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons
     sce_dst->preview = NULL;
   }
 
+  BKE_scene_copy_data_eevee(sce_dst, sce_src);
+}
+
+void BKE_scene_copy_data_eevee(Scene *sce_dst, const Scene *sce_src)
+{
+  /* Copy eevee data between scenes. */
+  sce_dst->eevee = sce_src->eevee;
   sce_dst->eevee.light_cache = NULL;
   sce_dst->eevee.light_cache_info[0] = '\0';
   /* TODO Copy the cache. */
@@ -374,9 +381,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
     sce_copy->unit = sce->unit;
     sce_copy->physics_settings = sce->physics_settings;
     sce_copy->audio = sce->audio;
-    sce_copy->eevee = sce->eevee;
-    sce_copy->eevee.light_cache = NULL;
-    sce_copy->eevee.light_cache_info[0] = '\0';
+    BKE_scene_copy_data_eevee(sce_copy, sce);
 
     if (sce->id.properties) {
       sce_copy->id.properties = IDP_CopyProperty(sce->id.properties);
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 06087cd7fa6..4f88578596f 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -118,8 +118,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
     freestyle_scene->id.properties = IDP_CopyProperty_ex(old_scene->id.properties, 0);
   }
   // Copy eevee render settings.
-  freestyle_scene->eevee = old_scene->eevee;
-  freestyle_scene->eevee.light_cache = NULL;
+  BKE_scene_copy_data_eevee(freestyle_scene, old_scene);
 
   /* Render with transparent background. */
   freestyle_scene->r.alphamode = R_ALPHAPREMUL;
diff --git a/source/blender/makesdna/DNA_object_defaults.h b/source/blender/makesdna/DNA_object_defaults.h
index 1105a8fd4e1..554d68f2d4a 100644
--- a/source/blender/makesdna/DNA_object_defaults.h
+++ b/source/blender/makesdna/DNA_object_defaults.h
@@ -66,7 +66,6 @@
     .col_mask = 0xffff, \
     .preview = NULL, \
     .duplicator_visibility_flag = OB_DUPLI_FLAG_VIEWPORT | OB_DUPLI_FLAG_RENDER, \
-    .fluidsimSettings = NULL, \
     .pc_ids = {NULL, NULL}, \
   }



More information about the Bf-blender-cvs mailing list