[Bf-blender-cvs] [c7bc1e7778a] modifier-panels-ui: Merge changes from patches and master
Hans Goudey
noreply at git.blender.org
Fri May 1 22:58:15 CEST 2020
Commit: c7bc1e7778a63a07300e64b50d79d8c977732be2
Author: Hans Goudey
Date: Fri May 1 15:58:07 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rBc7bc1e7778a63a07300e64b50d79d8c977732be2
Merge changes from patches and master
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
M source/blender/gpencil_modifiers/intern/MOD_ui_common.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_meshcache.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_multires.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_ocean.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_simpledeform.c
M source/blender/modifiers/intern/MOD_solidify.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/modifiers/intern/MOD_ui_common.c
M source/blender/modifiers/intern/MOD_uvwarp.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weightvgedit.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/modifiers/intern/MOD_wireframe.c
M source/blender/shader_fx/intern/FX_shader_rim.c
M source/blender/shader_fx/intern/FX_shader_shadow.c
M source/blender/shader_fx/intern/FX_ui_common.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
index 64d3c6f3846..4827cbcc794 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
@@ -450,27 +450,23 @@ static void panelRegister(ARegionType *region_type)
PanelType *panel_type = gpencil_modifier_panel_register(
region_type, eGpencilModifierType_Array, panel_draw);
gpencil_modifier_subpanel_register(region_type,
- "array_relative_offset",
+ "relative_offset",
"",
relative_offset_header_draw,
relative_offset_draw,
panel_type);
gpencil_modifier_subpanel_register(region_type,
- "array_constant_offset",
+ "constant_offset",
"",
constant_offset_header_draw,
constant_offset_draw,
panel_type);
- gpencil_modifier_subpanel_register(region_type,
- "array_object_offset",
- "",
- object_offset_header_draw,
- object_offset_draw,
- panel_type);
gpencil_modifier_subpanel_register(
- region_type, "array_randomize", "Randomize", NULL, random_panel_draw, panel_type);
+ region_type, "object_offset", "", object_offset_header_draw, object_offset_draw, panel_type);
+ gpencil_modifier_subpanel_register(
+ region_type, "randomize", "Randomize", NULL, random_panel_draw, panel_type);
gpencil_modifier_subpanel_register(
- region_type, "array_mask", "Influence", NULL, mask_panel_draw, panel_type);
+ region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type);
}
GpencilModifierTypeInfo modifierType_Gpencil_Array = {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
index 36573edacf4..f67ca619790 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
@@ -612,14 +612,10 @@ static void panelRegister(ARegionType *region_type)
{
PanelType *panel_type = gpencil_modifier_panel_register(
region_type, eGpencilModifierType_Build, panel_draw);
- gpencil_modifier_subpanel_register(region_type,
- "build_frame_range",
- "",
- frame_range_header_draw,
- frame_range_panel_draw,
- panel_type);
gpencil_modifier_subpanel_register(
- region_type, "build_mask", "Influence", NULL, mask_panel_draw, panel_type);
+ region_type, "frame_range", "", frame_range_header_draw, frame_range_panel_draw, panel_type);
+ gpencil_modifier_subpanel_register(
+ region_type, "_mask", "Influence", NULL, mask_panel_draw, panel_type);
}
/* ******************************************** */
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
index 383ace222ec..31d399c2327 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
@@ -217,9 +217,9 @@ static void panelRegister(ARegionType *region_type)
PanelType *panel_type = gpencil_modifier_panel_register(
region_type, eGpencilModifierType_Color, panel_draw);
PanelType *mask_panel_type = gpencil_modifier_subpanel_register(
- region_type, "color_mask", "Influence", NULL, mask_panel_draw, panel_type);
+ region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type);
gpencil_modifier_subpanel_register(region_type,
- "color_curve",
+ "curve",
"",
gpencil_modifier_curve_header_draw,
gpencil_modifier_curve_panel_draw,
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
index df647564885..8fd9f458c73 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
@@ -420,9 +420,9 @@ static void panelRegister(ARegionType *region_type)
PanelType *panel_type = gpencil_modifier_panel_register(
region_type, eGpencilModifierType_Hook, panel_draw);
gpencil_modifier_subpanel_register(
- region_type, "hook_falloff", "Falloff", NULL, falloff_panel_draw, panel_type);
+ region_type, "falloff", "Falloff", NULL, falloff_panel_draw, panel_type);
gpencil_modifier_subpanel_register(
- region_type, "hook_mask", "Influence", NULL, mask_panel_draw, panel_type);
+ region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type);
}
GpencilModifierTypeInfo modifierType_Gpencil_Hook = {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
index 1dee92c5db0..47731f1674f 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
@@ -257,7 +257,7 @@ static void panelRegister(ARegionType *region_type)
PanelType *panel_type = gpencil_modifier_panel_register(
region_type, eGpencilModifierType_Lattice, panel_draw);
gpencil_modifier_subpanel_register(
- region_type, "hook_mask", "Influence", NULL, mask_panel_draw, panel_type);
+ region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type);
}
GpencilModifierTypeInfo modifierType_Gpencil_Lattice = {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
index 7a3d64cec79..f6fd75a43fb 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
@@ -256,7 +256,7 @@ static void panelRegister(ARegionType *region_type)
PanelType *panel_type = gpencil_modifier_panel_register(
region_type, eGpencilModifierType_Mirror, panel_draw);
gpencil_modifier_subpanel_register(
- region_type, "mirror_mask", "Influence", NULL, mask_panel_draw, panel_type);
+ region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type);
}
GpencilModifierTypeInfo modifierType_Gpencil_Mirror = {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
index 5cdbc9b6b07..031a8fc4b5d 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
@@ -366,9 +366,9 @@ static void panelRegister(ARegionType *region_type)
PanelType *panel_type = gpencil_modifier_panel_register(
region_type, eGpencilModifierType_Multiply, panel_draw);
gpencil_modifier_subpanel_register(
- region_type, "multiplestrokes_fade", "", fade_header_draw, fade_panel_draw, panel_type);
+ region_type, "fade", "", fade_header_draw, fade_panel_draw, panel_type);
gpencil_modifier_subpanel_register(
- region_type, "multiplestrokes_mask", "Influence", NULL, mask_panel_draw, panel_type);
+ region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type);
}
GpencilModifierTypeInfo modifierType_Gpencil_Multiply = {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index 5306df44ea6..d17f42e80f4 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -324,11 +324,11 @@ static void panelRegister(ARegionType *region_type)
PanelType *panel_type = gpencil_modifier_panel_register(
region_type, eGpencilModifierType_Noise, panel_draw);
gpencil_modifier_subpanel_register(
- region_type, "noise_randomize", "", random_header_draw, random_panel_draw, panel_type);
+ region_type, "randomize", "", random_header_draw, random_panel_draw, panel_type);
PanelType *mask_panel_type = gpencil_modifier_subpanel_register(
- region_type, "noise_mask", "Influence", NULL, mask_panel_draw, panel_type);
+ region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type);
gpencil_modifier_subpanel_register(region_type,
- "noise_curve",
+ "curve",
"",
gpencil_modifier_curve_header_draw,
gpencil_modifier_curve_panel_draw,
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
index 501f83b9e7b..23f9616dae4 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
@@ -167,7 +167,7 @@ static void panelRegister(ARegionType *region_type)
PanelType *panel_type = gpencil_modifier_panel_register(
region_type, eGpencilModifierType_Offset, panel_draw);
gpencil_modifier_subpanel_register(
- region_type, "offset_mask", "Influence", NULL, mask_panel_draw, panel_type);
+ region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type);
}
GpencilModifierTypeInfo modifierType_Gpencil_Offset = {
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index 912c1cf8727..77c819a9513 100644
--- a/source/blender/gpencil_modifie
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list