diff --git a/src/bonsai/bonsai/bim/data/assets/shading_styles.json b/src/bonsai/bonsai/bim/data/assets/shading_styles.json index 602b8a652e..c37f0b27bc 100644 --- a/src/bonsai/bonsai/bim/data/assets/shading_styles.json +++ b/src/bonsai/bonsai/bim/data/assets/shading_styles.json @@ -7,12 +7,6 @@ 1.0, 1.0 ], - "scene.render.bake_bias": 0.0010000000474974513, - "scene.render.bake_margin": 16, - "scene.render.bake_margin_type": "ADJACENT_FACES", - "scene.render.bake_samples": 256, - "scene.render.bake_type": "NORMALS", - "scene.render.bake_user_scale": 0.0, "scene.render.border_max_x": 1.0, "scene.render.border_max_y": 1.0, "scene.render.border_min_x": 0.0, @@ -54,11 +48,6 @@ "scene.render.stamp_note_text": "", "scene.render.threads": 20, "scene.render.threads_mode": "AUTO", - "scene.render.use_bake_clear": true, - "scene.render.use_bake_lores_mesh": false, - "scene.render.use_bake_multires": false, - "scene.render.use_bake_selected_to_active": false, - "scene.render.use_bake_user_scale": false, "scene.render.use_border": false, "scene.render.use_compositing": true, "scene.render.use_crop_to_border": false, @@ -253,12 +242,6 @@ 1.0, 1.0 ], - "scene.render.bake_bias": 0.0010000000474974513, - "scene.render.bake_margin": 16, - "scene.render.bake_margin_type": "ADJACENT_FACES", - "scene.render.bake_samples": 256, - "scene.render.bake_type": "NORMALS", - "scene.render.bake_user_scale": 0.0, "scene.render.border_max_x": 1.0, "scene.render.border_max_y": 1.0, "scene.render.border_min_x": 0.0, @@ -300,11 +283,6 @@ "scene.render.stamp_note_text": "", "scene.render.threads": 20, "scene.render.threads_mode": "AUTO", - "scene.render.use_bake_clear": true, - "scene.render.use_bake_lores_mesh": false, - "scene.render.use_bake_multires": false, - "scene.render.use_bake_selected_to_active": false, - "scene.render.use_bake_user_scale": false, "scene.render.use_border": false, "scene.render.use_compositing": true, "scene.render.use_crop_to_border": false, @@ -503,12 +481,6 @@ "scene.eevee.shadow_ray_count": 1, "scene.eevee.shadow_step_count": 6, "scene.eevee.shadow_resolution_scale": 1.0, - "scene.render.bake_bias": 0.0010000000474974513, - "scene.render.bake_margin": 16, - "scene.render.bake_margin_type": "ADJACENT_FACES", - "scene.render.bake_samples": 256, - "scene.render.bake_type": "NORMALS", - "scene.render.bake_user_scale": 0.0, "scene.render.border_max_x": 1.0, "scene.render.border_max_y": 1.0, "scene.render.border_min_x": 0.0, @@ -550,11 +522,6 @@ "scene.render.stamp_note_text": "", "scene.render.threads": 20, "scene.render.threads_mode": "AUTO", - "scene.render.use_bake_clear": true, - "scene.render.use_bake_lores_mesh": false, - "scene.render.use_bake_multires": false, - "scene.render.use_bake_selected_to_active": false, - "scene.render.use_bake_user_scale": false, "scene.render.use_border": false, "scene.render.use_compositing": true, "scene.render.use_crop_to_border": false, diff --git a/src/bonsai/bonsai/bim/module/drawing/operator.py b/src/bonsai/bonsai/bim/module/drawing/operator.py index d1f0bb872e..6c98169c06 100644 --- a/src/bonsai/bonsai/bim/module/drawing/operator.py +++ b/src/bonsai/bonsai/bim/module/drawing/operator.py @@ -2706,6 +2706,21 @@ class ActivateDrawingStyle(bpy.types.Operator, tool.Ifc.Operator): def preprocess(path: str, value: Any) -> tuple[str, Any, bool, bool]: warning = False skip = False + + BLENDER_5_REMOVED = ( + "scene.render.bake_bias", + "scene.render.bake_margin", + "scene.render.bake_margin_type", + "scene.render.bake_samples", + "scene.render.bake_type", + "scene.render.bake_user_scale", + "scene.render.use_bake_clear", + "scene.render.use_bake_lores_mesh", + "scene.render.use_bake_multires", + "scene.render.use_bake_selected_to_active", + "scene.render.use_bake_user_scale", + ) + # 25.11.07, Blender 5+ if path == "scene.render.engine" and value in ("BLENDER_EEVEE", "BLENDER_EEVEE_NEXT"): if value == "BLENDER_EEVEE_NEXT": @@ -2715,8 +2730,15 @@ class ActivateDrawingStyle(bpy.types.Operator, tool.Ifc.Operator): ) warning = True value = tool.Blender.get_eevee_name() + elif tool.Blender.BLENDER_5 and path in BLENDER_5_REMOVED: + print( + f"Warning: Property '{path}' is removed " + "since Blender 5.0 and should be also removed from shading_styles.json." + ) + warning = True + skip = True # @25.05.12 - if path == "scene.display.shading.wireframe_color_type" and value == "MATERIAL": + elif path == "scene.display.shading.wireframe_color_type" and value == "MATERIAL": value = "THEME" print( f"Warning: Value 'MATERIAL' is outdated for property '{path}' "