Differential D8239

Sculpt: Make Sculpt Vertex Colors features experimental
ClosedPublic
Actions

Authored by Pablo Dobarro (pablodp606) on Jul 7 2020, 4:34 PM.

Tags

None

Subscribers

None

Details

Reviewers

Brecht Van Lommel (brecht)

Commits

rB03a00bda2b3f: Sculpt: Make Sculpt Vertex Colors features experimental

Diff Detail

Repository: rB Blender

Event Timeline

Pablo Dobarro (pablodp606) requested review of this revision.Jul 7 2020, 4:34 PM

Pablo Dobarro (pablodp606) created this revision.

Harbormaster completed remote builds in B8889: Diff 26598.Jul 7 2020, 4:34 PM

@Brecht Van Lommel (brecht) The only thing left is to disable the brush and sculpt vertex colors icons from the sculpt mode toolbar. Is that possible to do with an experimental option?

It appears to be possible like this:

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 75e7cc1..b513839 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -2485,7 +2485,12 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
             None,
             _defs_sculpt.mesh_filter,
             _defs_sculpt.cloth_filter,
-            _defs_sculpt.color_filter,
+            lambda context: (
+                (_defs_sculpt.color_filter,)
+                if bpy.context.preferences.view.show_developer_ui and \
+                   bpy.context.preferences.experimental.use_sculpt_vertex_colors
+                else ()
+            ),
             None,
             _defs_sculpt.mask_by_color,
             None,

@Brecht Van Lommel (brecht) Ok, I'll update the patch with that. And what for brush tools that are defined in the RNA in C? I guess that filtering them in the toolbar is not enough as they can still be selected from the sculpt tool menu for any brush

I'm not sure how best to do that. That's pretty hidden anyway, I don't think it's a big problem.

Disable sculpt vertex colors tools from the toolbar

Harbormaster completed remote builds in B8933: Diff 26665.Jul 9 2020, 5:16 PM

Brecht Van Lommel (brecht) accepted this revision.Jul 9 2020, 6:13 PM

Brecht Van Lommel (brecht) added inline comments.

source/blender/nodes/shader/nodes/node_shader_vertex_color.c
42–45	This will still need to be properly fixed in D8185: Fix T78369: Sculpt Vertex Colors not rendering in EEVEE to support rendering either.

This revision is now accepted and ready to land.Jul 9 2020, 6:13 PM

Closed by commit rB03a00bda2b3f: Sculpt: Make Sculpt Vertex Colors features experimental (authored by Pablo Dobarro (pablodp606)). · Explain WhyJul 9 2020, 6:26 PM

This revision was automatically updated to reflect the committed changes.

Pablo Dobarro (pablodp606) added a commit: rB03a00bda2b3f: Sculpt: Make Sculpt Vertex Colors features experimental.

Revision Contents
Changeset List

Path

Size

release/

scripts/

startup/

bl_ui/

properties_data_mesh.py

7 lines

space_toolsystem_toolbar.py

23 lines

space_userpref.py

1 line

space_view3d_toolbar.py

3 lines

source/

blender/

blenkernel/

intern/

2 lines

draw/

engines/

workbench/

workbench_engine.c

18 lines

intern/

draw_cache_extract_mesh.c

44 lines

draw_cache_impl_mesh.c

6 lines

editors/

sculpt_paint/

25 lines

sculpt_filter_color.c

2 lines

sculpt_intern.h

2 lines

gpu/

intern/

6 lines

makesdna/

DNA_userdef_types.h

3 lines

makesrna/

intern/

4 lines

nodes/

shader/

nodes/

node_shader_vertex_color.c

4 lines

Diff 26676

release/scripts/startup/bl_ui/properties_data_mesh.py

Loading...

release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

Loading...

release/scripts/startup/bl_ui/space_userpref.py

Loading...

release/scripts/startup/bl_ui/space_view3d_toolbar.py

Loading...

source/blender/blenkernel/intern/paint.c

Loading...

source/blender/draw/engines/workbench/workbench_engine.c

Loading...

source/blender/draw/intern/draw_cache_extract_mesh.c

Loading...

source/blender/draw/intern/draw_cache_impl_mesh.c

Loading...

source/blender/editors/sculpt_paint/sculpt.c

Loading...

source/blender/editors/sculpt_paint/sculpt_filter_color.c

Loading...

source/blender/editors/sculpt_paint/sculpt_intern.h

Loading...

source/blender/gpu/intern/gpu_buffers.c

Loading...

source/blender/makesdna/DNA_userdef_types.h

Loading...

source/blender/makesrna/intern/rna_userdef.c

Loading...

source/blender/nodes/shader/nodes/node_shader_vertex_color.c

Loading...