[Bf-blender-cvs] [ca8f30d54e8] sculpt-dev: Merge branch 'master' into sculpt-dev
Joseph Eagar
noreply at git.blender.org
Thu May 12 04:54:29 CEST 2022
Commit: ca8f30d54e8b96723ffc02b87a7d7f1ca5a54dda
Author: Joseph Eagar
Date: Wed May 11 16:05:35 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rBca8f30d54e8b96723ffc02b87a7d7f1ca5a54dda
Merge branch 'master' into sculpt-dev
===================================================================
===================================================================
diff --cc intern/cycles/kernel/CMakeLists.txt
index 259649e1884,473bdb67920..2e2a4224b76
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@@ -355,14 -356,10 +356,11 @@@ if(WITH_CYCLES_CUDA_BINARIES
string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR "${NVCC_OUT}")
set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
+
# warn for other versions
- if((CUDA_VERSION MATCHES "101") OR
- (CUDA_VERSION MATCHES "102") OR
- (CUDA_VERSION MATCHES "111") OR
- (CUDA_VERSION MATCHES "112") OR
- (CUDA_VERSION MATCHES "113") OR
- (CUDA_VERSION MATCHES "114"))
+ if((CUDA_VERSION STREQUAL "101") OR
+ (CUDA_VERSION STREQUAL "102") OR
+ (CUDA_VERSION_MAJOR STREQUAL "11"))
else()
message(WARNING
"CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, "
diff --cc release/scripts/addons
index a84f9f5ff43,67e43f9083b..7025cd28ede
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a84f9f5ff43f9291458cff2ce8583a956d054900
-Subproject commit 67e43f9083b79b33f5aa6ac4d1630946804d9534
++Subproject commit 7025cd28ede25eb44208722f842e35b10325c6cc
diff --cc release/scripts/startup/bl_ui/properties_paint_common.py
index 74ef71eef22,b8136f26e90..7e385a406c9
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@@ -1114,22 -405,14 +1114,28 @@@ class FalloffPanel(BrushPanel)
if not super().poll(context):
return False
settings = cls.paint_settings(context)
- return (settings and settings.brush and settings.brush.curve)
+ if not (settings and settings.brush and settings.brush.curve):
+ return False
+ if cls.get_brush_mode(context) == 'SCULPT_CURVES':
+ brush = settings.brush
+ if brush.curves_sculpt_tool in {'ADD', 'DELETE'}:
+ return False
+ return True
+ def draw_header(self, context):
+ layout = self.layout
+ settings = self.paint_settings(context)
+ mode = self.get_brush_mode(context)
+ brush = settings.brush
+
+ if mode == "SCULPT" and "falloff_curve" in brush.channels:
+ layout.label(text="Falloff")
+ ch = UnifiedPaintPanel.get_channel(context, brush, "falloff_curve")
+ layout.prop(ch.curve, "curve_preset", text="")
+ else:
+ layout.label(text="Falloff")
+ layout.prop(brush, "curve_preset", text="")
+
def draw(self, context):
layout = self.layout
settings = self.paint_settings(context)
@@@ -2171,34 -954,11 +2205,24 @@@ def brush_settings_advanced(layout, con
# sculpt plane settings
if capabilities.has_sculpt_plane:
layout.prop(brush, "sculpt_plane")
- col = layout.column(heading="Use Original", align=True)
- col.prop(brush, "use_original_normal", text="Normal")
- col.prop(brush, "use_original_plane", text="Plane")
+
+ col = layout.column(heading="Use Original", align=False)
+ col = col.column()
+
+ UnifiedPaintPanel.channel_unified(col,
+ context,
+ brush,
+ "original_normal",
+ text="Normal",
+ expand=False)
+ UnifiedPaintPanel.channel_unified(col,
+ context,
+ brush,
+ "original_plane",
+ text="Plane",
+ expand=False)
layout.separator()
- elif mode == 'SCULPT_CURVES':
- if brush.curves_sculpt_tool == 'ADD':
- layout.prop(brush.curves_sculpt_settings, "add_amount")
- layout.prop(brush.curves_sculpt_settings, "curve_length")
- layout.prop(brush.curves_sculpt_settings, "interpolate_length")
- layout.prop(brush.curves_sculpt_settings, "interpolate_shape")
- elif brush.curves_sculpt_tool == 'GROW_SHRINK':
- layout.prop(brush.curves_sculpt_settings, "scale_uniform")
- layout.prop(brush.curves_sculpt_settings, "minimum_length")
-
# 3D and 2D Texture Paint.
elif mode in {'PAINT_TEXTURE', 'PAINT_2D'}:
capabilities = brush.image_paint_capabilities
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 053d28b06b1,4ff62b2ca00..fd209c21cc7
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -2218,17 -2210,12 +2219,15 @@@ class VIEW3D_MT_add(Menu)
# "align_view" to work on first call (see T32719).
layout.operator_context = 'EXEC_REGION_WIN'
- # layout.operator_menu_enum("object.mesh_add", "type", text="Mesh", icon='OUTLINER_OB_MESH')
+ # layout.operator_menu_enum("object.mesh_add", "type", text="Mesh",
+ # icon='OUTLINER_OB_MESH')
layout.menu("VIEW3D_MT_mesh_add", icon='OUTLINER_OB_MESH')
- # layout.operator_menu_enum("object.curve_add", "type", text="Curve", icon='OUTLINER_OB_CURVE')
+ # layout.operator_menu_enum("object.curve_add", "type", text="Curve",
+ # icon='OUTLINER_OB_CURVE')
layout.menu("VIEW3D_MT_curve_add", icon='OUTLINER_OB_CURVE')
- if context.preferences.experimental.use_new_curves_type:
- layout.menu("VIEW3D_MT_curves_add", icon='OUTLINER_OB_CURVES')
# layout.operator_menu_enum("object.surface_add", "type", text="Surface", icon='OUTLINER_OB_SURFACE')
+
layout.menu("VIEW3D_MT_surface_add", icon='OUTLINER_OB_SURFACE')
layout.menu("VIEW3D_MT_metaball_add", text="Metaball", icon='OUTLINER_OB_META')
layout.operator("object.text_add", text="Text", icon='OUTLINER_OB_FONT')
@@@ -7854,7 -7893,10 +7913,10 @@@ classes =
VIEW3D_PT_sculpt_context_menu,
TOPBAR_PT_gpencil_materials,
TOPBAR_PT_gpencil_vertexcolor,
- TOPBAR_PT_annotation_layers,)
+ TOPBAR_PT_annotation_layers,
+ VIEW3D_PT_curves_sculpt_add_shape,
- VIEW3D_PT_curves_sculpt_grow_shrink_scaling,
++ VIEW3D_PT_curves_sculpt_grow_shrink_scaling
+ )
if __name__ == "__main__": # only for live edit.
diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 3d5914bce25,3e1754fd908..8fe0ff63c9a
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -1,11 -1,9 +1,11 @@@
# SPDX-License-Identifier: GPL-2.0-or-later
# <pep8 compliant>
-from bpy.types import Menu, Panel, UIList
+from bpy.props import EnumProperty
+from bpy.types import Operator
+from bpy.types import Menu, Panel, UIList, WindowManager, SpaceProperties
from bl_ui.properties_grease_pencil_common import (
- GreasePencilSculptOptionsPanel,
+ GreasePencilSculptAdvancedPanel,
GreasePencilDisplayPanel,
GreasePencilBrushFalloff,
)
@@@ -443,35 -393,8 +443,39 @@@ class VIEW3D_PT_tools_brush_settings_ad
@classmethod
def poll(cls, context):
+ if context.mode == 'SCULPT':
+ return False
+
+ return View3DPaintBrushPanel.poll(cls, context)
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.use_property_split = True
+ layout.use_property_decorate = False # No animation.
+
+ settings = UnifiedPaintPanel.paint_settings(context)
+ brush = settings.brush
+
+ brush_settings_advanced(layout.column(), context, brush, self.is_popover)
+
+class VIEW3D_PT_tools_brush_settings_advanced_sculpt(Panel, View3DPaintBrushPanel):
+ bl_context = ".paint_common"
+ #bl_parent_id = "VIEW3D_PT_tools_brush_settings"
+ bl_label = "Advanced"
+ bl_options = {'DEFAULT_CLOSED'}
+ bl_ui_units_x = 14
+
+ @classmethod
+ def poll(cls, context):
+ if context.mode != 'SCULPT':
+ return False
+
+ mode = cls.get_brush_mode(context)
- return mode is not None and mode != 'SCULPT_CURVES'
++ if mode is None or mode == 'SCULPT_CURVES':
++ return False
++
+ return View3DPaintBrushPanel.poll(context)
def draw(self, context):
layout = self.layout
@@@ -1570,6 -1053,37 +1574,36 @@@ class VIEW3D_PT_sculpt_symmetry_for_top
draw = VIEW3D_PT_sculpt_symmetry.draw
-
+ class VIEW3D_PT_curves_sculpt_symmetry(Panel, View3DPaintPanel):
+ bl_context = ".curves_sculpt" # dot on purpose (access from topbar)
+ bl_label = "Symmetry"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ return context.object and context.object.type == 'CURVES'
+
+ def draw(self, context):
+ layout = self.layout
+ layout.use_property_split = True
+ layout.use_property_decorate = False
+
+ curves = context.object.data
+
+ row = layout.row(align=True, heading="Mirror")
+ row.prop(curves, "use_mirror_x", text="X", toggle=True)
+ row.prop(curves, "use_mirror_y", text="Y", toggle=True)
+ row.prop(curves, "use_mirror_z", text="Z", toggle=True)
+
+
+ class VIEW3D_PT_curves_sculpt_symmetry_for_topbar(Panel):
+ bl_space_type = 'TOPBAR'
+ bl_region_type = 'HEADER'
+ bl_label = "Symmetry"
+
+ draw = VIEW3D_PT_curves_sculpt_symmetry.draw
+
+
# ********** default tools for weight-paint ****************
@@@ -2848,8 -2385,10 +2910,11 @@@ classes = (VIEW3D_MT_brush_context_menu
VIEW3D_PT_sculpt_symmetry_for_topbar,
VIEW3D_PT_sculpt_options,
VIEW3D_PT_sculpt_options_gravity,
+ VIEW3D_PT_sculpt_automasking,
+ VIEW3D_PT_curves_sculpt_symmetry,
+ VIEW3D_PT_curves_sculpt_symmetry_for_topbar,
+
VIEW3D_PT_tools_weightpaint_symmetry,
VIEW3D_PT_tools_weightpaint_symmetry_for_topbar,
VIEW3D_PT_tools_weightpaint_options,
diff --cc source/blender/blenkernel/CMakeLists.txt
index 364775e296c,0b4f81df452..6f2c51bbecf
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -251,10 -243,9 +253,10 @
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list