[Bf-blender-cvs] [b6764b9a31f] modifier-panels-ui: Update for latest master, small cleanup and renaming
Hans Goudey
noreply at git.blender.org
Fri Jun 5 18:46:52 CEST 2020
Commit: b6764b9a31f069f6fc08f3e34f9c9a6ed14a3f53
Author: Hans Goudey
Date: Fri Jun 5 12:46:24 2020 -0400
Branches: modifier-panels-ui
https://developer.blender.org/rBb6764b9a31f069f6fc08f3e34f9c9a6ed14a3f53
Update for latest master, small cleanup and renaming
===================================================================
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/object/object_shader_fx.c
M source/blender/editors/space_buttons/space_buttons.c
M source/blender/gpencil_modifiers/CMakeLists.txt
R099 source/blender/gpencil_modifiers/intern/MOD_ui_common.c source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c
R100 source/blender/gpencil_modifiers/intern/MOD_ui_common.h source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h
M source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
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/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/shader_fx/intern/FX_ui_common.c
===================================================================
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 513082e8a3e..884e43b4026 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -1054,7 +1054,7 @@ static uiBut *ui_item_with_label(uiLayout *layout,
#ifdef UI_PROP_DECORATE
/* Only for alignment. */
- if (use_prop_sep) {
+ if (layout->item.flag & UI_ITEM_PROP_SEP) {
if ((layout->item.flag & UI_ITEM_PROP_DECORATE) &&
(layout->item.flag & UI_ITEM_PROP_DECORATE_NO_PAD) == 0) {
uiItemL(layout_prop_decorate ? layout_prop_decorate : sub, NULL, ICON_BLANK1);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 0661dce1869..234278b4bb2 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1917,7 +1917,7 @@ void uiTemplateGpencilModifiers(uiLayout *UNUSED(layout), bContext *C)
static void constraint_reorder(bContext *C, Panel *panel, int new_index)
{
Object *ob = CTX_data_active_object(C);
- ListBase *lb = get_active_constraints(ob);
+ ListBase *lb = ED_object_constraint_list_from_context(ob);
bool constraint_from_bone = false;
if (ob->mode & OB_MODE_POSE) {
bPoseChannel *pchan;
@@ -1944,7 +1944,7 @@ static void constraint_reorder(bContext *C, Panel *panel, int new_index)
static short get_constraint_expand_flag(const bContext *C, Panel *panel)
{
Object *ob = CTX_data_active_object(C);
- ListBase *lb = get_active_constraints(ob);
+ ListBase *lb = ED_object_constraint_list_from_context(ob);
bConstraint *con = BLI_findlink(lb, panel->runtime.list_index);
return con->ui_expand_flag;
}
@@ -1955,7 +1955,7 @@ static short get_constraint_expand_flag(const bContext *C, Panel *panel)
static void set_constraint_expand_flag(const bContext *C, Panel *panel, short expand_flag)
{
Object *ob = CTX_data_active_object(C);
- ListBase *lb = get_active_constraints(ob);
+ ListBase *lb = ED_object_constraint_list_from_context(ob);
bConstraint *con = BLI_findlink(lb, panel->runtime.list_index);
con->ui_expand_flag = expand_flag;
}
@@ -1974,7 +1974,7 @@ void uiTemplateConstraints(uiLayout *UNUSED(layout), bContext *C)
ScrArea *sa = CTX_wm_area(C);
ARegion *region = CTX_wm_region(C);
Object *ob = CTX_data_active_object(C);
- ListBase *constraints = get_active_constraints(ob);
+ ListBase *constraints = ED_object_constraint_list_from_context(ob);
bool panels_match = UI_panel_list_matches_data(region, constraints, constraint_panel_id);
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 19974655cbb..13148f02a73 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -1581,7 +1581,7 @@ static int constraint_move_to_index_exec(bContext *C, wmOperator *op)
int index = RNA_int_get(op->ptr, "index");
if (con) {
- ListBase *conlist = get_constraint_lb(ob, con, NULL);
+ ListBase *conlist = ED_object_constraint_list_from_constraint(ob, con, NULL);
int current_index = BLI_findindex(conlist, con);
BLI_listbase_link_move(conlist, con, index - current_index);
diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c
index 0bc5ad4165d..eba1776c4cc 100644
--- a/source/blender/editors/object/object_shader_fx.c
+++ b/source/blender/editors/object/object_shader_fx.c
@@ -532,7 +532,7 @@ void OBJECT_OT_shaderfx_move_down(wmOperatorType *ot)
static bool shaderfx_move_to_index_poll(bContext *C)
{
- return true;
+ return edit_shaderfx_poll_generic(C, &RNA_ShaderFx, 0);
}
static int shaderfx_move_to_index_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c
index 5ab3304c0e6..53ab8472f71 100644
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@ -35,10 +35,6 @@
#include "BKE_screen.h"
#include "BKE_shader_fx.h"
-#include "DNA_gpencil_modifier_types.h" /* Registering list panels. */
-#include "DNA_modifier_types.h"
-#include "DNA_shader_fx_types.h"
-
#include "DNA_modifier_types.h"
#include "ED_screen.h"
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index a73fb92dfc2..92aacc74190 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -43,7 +43,7 @@ set(INC_SYS
set(SRC
intern/MOD_gpencil_util.h
- intern/MOD_ui_common.c
+ intern/MOD_gpencil_ui_common.c
intern/MOD_gpencil_util.c
intern/MOD_gpencilarmature.c
@@ -65,7 +65,7 @@ set(SRC
intern/MOD_gpenciltime.c
intern/MOD_gpenciltint.c
- intern/MOD_ui_common.h
+ intern/MOD_gpencil_ui_common.h
MOD_gpencil_modifiertypes.h
)
diff --git a/source/blender/gpencil_modifiers/intern/MOD_ui_common.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c
similarity index 99%
rename from source/blender/gpencil_modifiers/intern/MOD_ui_common.c
rename to source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c
index 138b8807744..e3faa34f6f4 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_ui_common.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c
@@ -47,7 +47,7 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "MOD_ui_common.h" /* Self include */
+#include "MOD_gpencil_ui_common.h" /* Self include */
/**
* Poll function so these modifier panels only show for grease pencil objects.
diff --git a/source/blender/gpencil_modifiers/intern/MOD_ui_common.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h
similarity index 100%
rename from source/blender/gpencil_modifiers/intern/MOD_ui_common.h
rename to source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
index 6adfa16de32..922cfe4944b 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
@@ -58,8 +58,8 @@
#include "RNA_access.h"
#include "MOD_gpencil_modifiertypes.h"
+#include "MOD_gpencil_ui_common.h"
#include "MOD_gpencil_util.h"
-#include "MOD_ui_common.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
index 9741e85fed1..32c4a4f2deb 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
@@ -67,8 +67,8 @@
#include "DEG_depsgraph_query.h"
#include "MOD_gpencil_modifiertypes.h"
+#include "MOD_gpencil_ui_common.h"
#include "MOD_gpencil_util.h"
-#include "MOD_ui_common.h"
typedef struct tmpStrokes {
struct tmpStrokes *next, *prev;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
index 496e88bf04b..9189c6a0218 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
@@ -54,8 +54,8 @@
#include "DEG_depsgraph_query.h"
#include "MOD_gpencil_modifiertypes.h"
+#include "MOD_gpencil_ui_common.h"
#include "MOD_gpencil_util.h"
-#include "MOD_ui_common.h"
static void initData(GpencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
index be26b4f39a2..eb4caf6a059 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
@@ -55,8 +55,8 @@
#include "DEG_depsgraph.h"
#include "MOD_gpencil_modifiertypes.h"
+#include "MOD_gpencil_ui_common.h"
#include "MOD_gpencil_util.h"
-#include "MOD_ui_common.h"
static void initData(GpencilModifierData *md)
{
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
index 614b2b499c4..62c608af746 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
@@ -59,8 +59,8 @@
#include "RNA_access.h"
#include "MOD_gpencil_modifiertypes.h"
+#include "MOD_gpencil_ui_common.h"
#include "MOD_gpencil_util.h"
-#include "MOD_ui_common.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
index 42f1af1dc48..890f9979775 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
@@ -55,8 +55,8 @@
#include "RNA_access.h"
#include "MOD_gpencil_modifiertypes.h"
+#include "MOD_gpencil_ui_common.h"
#include "MOD_gpencil_util.h"
-#include "MOD_ui_common.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
index 1e7698cae45..34f9eae3d22 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
@@ -57,8 +57,8 @@
#include "RNA_access.h"
#include "MOD_gpencil_modifiertypes.h"
+#include "MOD_gpencil_ui_common.h"
#include "MOD_gpencil_util.h"
-#include "MOD_ui_common.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
index 24dd2147a30..892a95496a1 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c
+++ b/source/blender/gpencil_modifiers/intern/MOD
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list