diff --git a/src/bonsai/bonsai/bim/data/assets/shading_styles.json b/src/bonsai/bonsai/bim/data/assets/shading_styles.json index dd7ded4423..641b9052b6 100644 --- a/src/bonsai/bonsai/bim/data/assets/shading_styles.json +++ b/src/bonsai/bonsai/bim/data/assets/shading_styles.json @@ -47,8 +47,6 @@ "scene.render.simplify_gpencil_shader_fx": true, "scene.render.simplify_gpencil_tint": true, "scene.render.simplify_gpencil_view_fill": true, - "scene.render.simplify_shadows": 1.0, - "scene.render.simplify_shadows_render": 1.0, "scene.render.simplify_subdivision": 6, "scene.render.simplify_subdivision_render": 6, "scene.render.simplify_volumes": 1.0, @@ -147,7 +145,7 @@ "scene.display.shading.use_scene_world_render": false, "scene.display.shading.use_studiolight_view_rotation": true, "scene.display.shading.use_world_space_lighting": false, - "scene.display.shading.wireframe_color_type": "MATERIAL", + "scene.display.shading.wireframe_color_type": "THEME", "scene.display.shading.xray_alpha": 0.5, "scene.display.shading.xray_alpha_wireframe": 0.0, "scene.display.light_direction": [ @@ -162,7 +160,6 @@ "scene.display.shadow_focus": 0.0, "scene.display.shadow_shift": 0.10000000149011612, "scene.display.viewport_aa": "FXAA", - "space.overlay.backwire_opacity": 0.5, "space.overlay.bone_wire_alpha": 1.0, "space.overlay.display_handle": "SELECTED", "space.overlay.fade_inactive_alpha": 0.4000000059604645, @@ -189,7 +186,6 @@ "space.overlay.show_edge_crease": true, "space.overlay.show_edge_seams": true, "space.overlay.show_edge_sharp": true, - "space.overlay.show_edges": false, "space.overlay.show_extra_edge_angle": false, "space.overlay.show_extra_edge_length": false, "space.overlay.show_extra_face_angle": false, @@ -208,7 +204,6 @@ "space.overlay.show_motion_paths": true, "space.overlay.show_object_origins": false, "space.overlay.show_object_origins_all": false, - "space.overlay.show_occlude_wire": false, "space.overlay.show_onion_skins": false, "space.overlay.show_ortho_grid": true, "space.overlay.show_outline_selected": true, @@ -298,8 +293,6 @@ "scene.render.simplify_gpencil_shader_fx": true, "scene.render.simplify_gpencil_tint": true, "scene.render.simplify_gpencil_view_fill": true, - "scene.render.simplify_shadows": 1.0, - "scene.render.simplify_shadows_render": 1.0, "scene.render.simplify_subdivision": 6, "scene.render.simplify_subdivision_render": 6, "scene.render.simplify_volumes": 1.0, @@ -398,7 +391,7 @@ "scene.display.shading.use_scene_world_render": false, "scene.display.shading.use_studiolight_view_rotation": true, "scene.display.shading.use_world_space_lighting": false, - "scene.display.shading.wireframe_color_type": "MATERIAL", + "scene.display.shading.wireframe_color_type": "THEME", "scene.display.shading.xray_alpha": 0.5, "scene.display.shading.xray_alpha_wireframe": 0.0, "scene.display.light_direction": [ @@ -413,7 +406,6 @@ "scene.display.shadow_focus": 0.0, "scene.display.shadow_shift": 0.10000000149011612, "scene.display.viewport_aa": "FXAA", - "space.overlay.backwire_opacity": 0.5, "space.overlay.bone_wire_alpha": 1.0, "space.overlay.display_handle": "SELECTED", "space.overlay.fade_inactive_alpha": 0.4000000059604645, @@ -440,7 +432,6 @@ "space.overlay.show_edge_crease": true, "space.overlay.show_edge_seams": true, "space.overlay.show_edge_sharp": true, - "space.overlay.show_edges": false, "space.overlay.show_extra_edge_angle": false, "space.overlay.show_extra_edge_length": false, "space.overlay.show_extra_face_angle": false, @@ -459,7 +450,6 @@ "space.overlay.show_motion_paths": true, "space.overlay.show_object_origins": false, "space.overlay.show_object_origins_all": false, - "space.overlay.show_occlude_wire": false, "space.overlay.show_onion_skins": false, "space.overlay.show_ortho_grid": true, "space.overlay.show_outline_selected": true, @@ -520,7 +510,7 @@ "scene.render.border_min_x": 0.0, "scene.render.border_min_y": 0.0, "scene.render.dither_intensity": 1.0, - "scene.render.engine": "BLENDER_EEVEE", + "scene.render.engine": "BLENDER_EEVEE_NEXT", "scene.render.film_transparent": false, "scene.render.filter_size": 1.5, "scene.render.fps": 24, @@ -549,8 +539,6 @@ "scene.render.simplify_gpencil_shader_fx": true, "scene.render.simplify_gpencil_tint": true, "scene.render.simplify_gpencil_view_fill": true, - "scene.render.simplify_shadows": 1.0, - "scene.render.simplify_shadows_render": 1.0, "scene.render.simplify_subdivision": 6, "scene.render.simplify_subdivision_render": 6, "scene.render.simplify_volumes": 1.0, @@ -649,7 +637,7 @@ "scene.display.shading.use_scene_world_render": false, "scene.display.shading.use_studiolight_view_rotation": true, "scene.display.shading.use_world_space_lighting": false, - "scene.display.shading.wireframe_color_type": "MATERIAL", + "scene.display.shading.wireframe_color_type": "THEME", "scene.display.shading.xray_alpha": 0.5, "scene.display.shading.xray_alpha_wireframe": 0.0, "scene.display.light_direction": [ @@ -664,7 +652,6 @@ "scene.display.shadow_focus": 0.0, "scene.display.shadow_shift": 0.10000000149011612, "scene.display.viewport_aa": "FXAA", - "space.overlay.backwire_opacity": 0.5, "space.overlay.bone_wire_alpha": 1.0, "space.overlay.display_handle": "SELECTED", "space.overlay.fade_inactive_alpha": 0.4000000059604645, @@ -691,7 +678,6 @@ "space.overlay.show_edge_crease": true, "space.overlay.show_edge_seams": true, "space.overlay.show_edge_sharp": true, - "space.overlay.show_edges": false, "space.overlay.show_extra_edge_angle": false, "space.overlay.show_extra_edge_length": false, "space.overlay.show_extra_face_angle": false, @@ -710,7 +696,6 @@ "space.overlay.show_motion_paths": true, "space.overlay.show_object_origins": true, "space.overlay.show_object_origins_all": false, - "space.overlay.show_occlude_wire": false, "space.overlay.show_onion_skins": false, "space.overlay.show_ortho_grid": true, "space.overlay.show_outline_selected": true, diff --git a/src/bonsai/bonsai/bim/module/drawing/operator.py b/src/bonsai/bonsai/bim/module/drawing/operator.py index 8c86861e28..7b4c50d4f9 100644 --- a/src/bonsai/bonsai/bim/module/drawing/operator.py +++ b/src/bonsai/bonsai/bim/module/drawing/operator.py @@ -2515,6 +2515,7 @@ class ActivateDrawingStyle(bpy.types.Operator, tool.Ifc.Operator): bl_options = {"REGISTER", "UNDO"} has_errors_during_activation = False + has_warnings_during_activation = False def _execute(self, context): scene = context.scene @@ -2541,6 +2542,11 @@ class ActivateDrawingStyle(bpy.types.Operator, tool.Ifc.Operator): ) bonsai.bim.handler.refresh_ui_data() + if self.has_warnings_during_activation: + self.report( + {"WARNING"}, + "There were warnings setting some drawing style properies, see system console for the details.", + ) if self.has_errors_during_activation: self.report( {"WARNING"}, @@ -2553,7 +2559,60 @@ class ActivateDrawingStyle(bpy.types.Operator, tool.Ifc.Operator): scene = context.scene # Do not remove. It is used in exec later assert (space := tool.Blender.get_view3d_space()) # Do not remove. It is used in exec later style = json.loads(self.drawing_style.raster_style) + + def preprocess(path: str, value: Any) -> tuple[str, Any, bool, bool]: + warning = False + skip = False + # @25.05.12 + if path == "scene.render.engine" and value == "BLENDER_EEVEE": + value = "BLENDER_EEVEE_NEXT" + print( + f"Warning: Value 'BLENDER_EEVEE' is outdated for property '{path}' " + "since Blender 4.2 and should be replaced with 'BLENDER_EEVEE_NEXT' in shading_styles.json." + ) + warning = True + # @25.05.12 + if path == "scene.display.shading.wireframe_color_type" and value == "MATERIAL": + value = "THEME" + print( + f"Warning: Value 'MATERIAL' is outdated for property '{path}' " + "since Blender 4.0 and should be replaced with 'THEME' in shading_styles.json." + ) + warning = True + # @25.05.12 + elif path in ("scene.render.simplify_shadows", "scene.render.simplify_shadows_render"): + print( + f"Warning: Property '{path}' is removed " + "since Blender 4.2 and should be also removed from shading_styles.json." + ) + warning = True + skip = True + # @25.05.12 + elif path in ("space.overlay.backwire_opacity", "space.overlay.show_edges"): + print( + f"Warning: Property '{path}' is removed " + "since Blender 4.1 and should be also removed from shading_styles.json." + ) + warning = True + skip = True + # @25.05.12 + elif path in ("space.overlay.show_occlude_wire",): + print( + f"Warning: Property '{path}' is removed " + "since Blender 3.6 and should be also removed from shading_styles.json." + ) + warning = True + skip = True + + return path, value, warning, skip + for path, value in style.items(): + path, value, warning, skip = preprocess(path, value) + self.has_warnings_during_activation |= warning + + if skip: + continue + try: if isinstance(value, str): exec(f"{path} = '{value}'")