[Bf-blender-cvs] [36a9436d808] blender2.8: Merge branch 'master' into blender2.8
Campbell Barton
noreply at git.blender.org
Sun Jul 1 16:25:16 CEST 2018
Commit: 36a9436d808837110a9c1bb2ec897a358ea62d56
Author: Campbell Barton
Date: Sun Jul 1 16:22:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB36a9436d808837110a9c1bb2ec897a358ea62d56
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc intern/cycles/blender/blender_util.h
index e9ede91c295,7e61888348b..4e754d22984
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@@ -304,10 -304,10 +304,10 @@@ static inline uint get_layer(const BL::
return layer;
}
- static inline uint get_layer(const BL::Array<int, 20>& array,
- const BL::Array<int, 8>& local_array,
+ static inline uint get_layer(const BL::Array<bool, 20>& array,
+ const BL::Array<bool, 8>& local_array,
bool is_light = false,
- uint scene_layers = (1 << 20) - 1)
+ uint view_layers = (1 << 20) - 1)
{
uint layer = 0;
diff --cc source/blender/blenkernel/BKE_mesh.h
index 76205da9565,060bb606c2c..c87c22953f1
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@@ -467,9 -409,9 +467,9 @@@ void BKE_mesh_calc_relative_deform
/* *** mesh_validate.c *** */
- int BKE_mesh_validate(struct Mesh *me, const int do_verbose, const int cddata_check_mask);
+ bool BKE_mesh_validate(struct Mesh *me, const bool do_verbose, const bool cddata_check_mask);
-void BKE_mesh_cd_validate(struct Mesh *me);
+bool BKE_mesh_is_valid(struct Mesh *me);
- int BKE_mesh_validate_material_indices(struct Mesh *me);
+ bool BKE_mesh_validate_material_indices(struct Mesh *me);
bool BKE_mesh_validate_arrays(
struct Mesh *me,
diff --cc source/blender/editors/armature/pose_edit.c
index ffe64cc24b0,becda3e452e..b3775402a4b
--- a/source/blender/editors/armature/pose_edit.c
+++ b/source/blender/editors/armature/pose_edit.c
@@@ -923,7 -908,7 +923,7 @@@ void ARMATURE_OT_armature_layers(wmOper
/* Present a popup to get the layers that should be used */
static int pose_bone_layers_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
- int layers[32] = {0}; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */
- bool layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */
++ bool layers[32] = {0}; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */
/* get layers that are active already */
CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones)
@@@ -1025,8 -1009,9 +1025,8 @@@ static int armature_bone_layers_invoke(
static int armature_bone_layers_exec(bContext *C, wmOperator *op)
{
Object *ob = CTX_data_edit_object(C);
- bArmature *arm = (ob) ? ob->data : NULL;
PointerRNA ptr;
- int layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */
+ bool layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */
/* get the values set in the operator properties */
RNA_boolean_get_array(op->ptr, "layers", layers);
diff --cc source/blender/editors/include/ED_view3d.h
index 68aeccdcc32,43bdafed277..b0bf253dbee
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -407,7 -354,7 +407,7 @@@ void ED_view3d_check_mats_rv3d(struct R
# define ED_view3d_clear_mats_rv3d(rv3d) (void)(rv3d)
# define ED_view3d_check_mats_rv3d(rv3d) (void)(rv3d)
#endif
- int ED_view3d_view_layer_set(int lay, const int *values, int *active);
-int ED_view3d_scene_layer_set(int lay, const bool *values, int *active);
++int ED_view3d_view_layer_set(int lay, const bool *values, int *active);
struct RV3DMatrixStore *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d);
void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, struct RV3DMatrixStore *rv3dmat);
diff --cc source/blender/editors/include/UI_interface.h
index dcfb1ac3219,0204301941e..39dee884f48
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@@ -985,16 -916,11 +985,16 @@@ bool uiLayoutGetKeepAspect(uiLayout *la
int uiLayoutGetWidth(uiLayout *layout);
float uiLayoutGetScaleX(uiLayout *layout);
float uiLayoutGetScaleY(uiLayout *layout);
+int uiLayoutGetEmboss(uiLayout *layout);
+bool uiLayoutGetPropSep(uiLayout *layout);
+bool uiLayoutGetPropDecorate(uiLayout *layout);
/* layout specifiers */
- uiLayout *uiLayoutRow(uiLayout *layout, int align);
- uiLayout *uiLayoutColumn(uiLayout *layout, int align);
- uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, int align);
+ uiLayout *uiLayoutRow(uiLayout *layout, bool align);
+ uiLayout *uiLayoutColumn(uiLayout *layout, bool align);
+ uiLayout *uiLayoutColumnFlow(uiLayout *layout, int number, bool align);
+uiLayout *uiLayoutGridFlow(
- uiLayout *layout, int row_major, int num_columns, int even_columns, int even_rows, int align);
++ uiLayout *layout, bool row_major, int columns_len, bool even_columns, bool even_rows, bool align);
uiLayout *uiLayoutBox(uiLayout *layout);
uiLayout *uiLayoutListBox(uiLayout *layout, struct uiList *ui_list, struct PointerRNA *ptr, struct PropertyRNA *prop,
struct PointerRNA *actptr, struct PropertyRNA *actprop);
@@@ -1036,26 -946,24 +1036,26 @@@ void uiTemplateSearchPreview
void uiTemplatePathBuilder(uiLayout *layout, struct PointerRNA *ptr, const char *propname,
struct PointerRNA *root_ptr, const char *text);
uiLayout *uiTemplateModifier(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
+
+void uiTemplateOperatorRedoProperties(uiLayout *layout, const struct bContext *C);
+
uiLayout *uiTemplateConstraint(uiLayout *layout, struct PointerRNA *ptr);
- void uiTemplatePreview(uiLayout *layout, struct bContext *C, struct ID *id, int show_buttons, struct ID *parent,
+ void uiTemplatePreview(uiLayout *layout, struct bContext *C, struct ID *id, bool show_buttons, struct ID *parent,
struct MTex *slot, const char *preview_id);
- void uiTemplateColorRamp(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int expand);
+ void uiTemplateColorRamp(uiLayout *layout, struct PointerRNA *ptr, const char *propname, bool expand);
+void uiTemplateIcon(uiLayout *layout, int icon_value, float icon_scale);
- void uiTemplateIconView(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int show_labels, float icon_scale);
+ void uiTemplateIconView(uiLayout *layout, struct PointerRNA *ptr, const char *propname, bool show_labels, float icon_scale);
void uiTemplateHistogram(uiLayout *layout, struct PointerRNA *ptr, const char *propname);
void uiTemplateWaveform(uiLayout *layout, struct PointerRNA *ptr, const char *propname);
void uiTemplateVectorscope(uiLayout *layout, struct PointerRNA *ptr, const char *propname);
void uiTemplateCurveMapping(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int type,
- int levels, int brush, int neg_slope);
- void uiTemplateColorPicker(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int value_slider, int lock, int lock_luminosity, int cubic);
- void uiTemplatePalette(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int color);
+ bool levels, bool brush, bool neg_slope);
+ void uiTemplateColorPicker(uiLayout *layout, struct PointerRNA *ptr, const char *propname, bool value_slider, bool lock, bool lock_luminosity, bool cubic);
+ void uiTemplatePalette(uiLayout *layout, struct PointerRNA *ptr, const char *propname, bool color);
void uiTemplateLayers(uiLayout *layout, struct PointerRNA *ptr, const char *propname,
PointerRNA *used_ptr, const char *used_propname, int active_layer);
- void uiTemplateImage(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *userptr, int compact, int multiview);
- void uiTemplateImageSettings(uiLayout *layout, struct PointerRNA *imfptr, int color_management);
-void uiTemplateGameStates(uiLayout *layout, struct PointerRNA *ptr, const char *propname,
- PointerRNA *used_ptr, const char *used_propname, int active_state);
+ void uiTemplateImage(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *userptr, bool compact, bool multiview);
+ void uiTemplateImageSettings(uiLayout *layout, struct PointerRNA *imfptr, bool color_management);
void uiTemplateImageStereo3d(uiLayout *layout, struct PointerRNA *stereo3d_format_ptr);
void uiTemplateImageViews(uiLayout *layout, struct PointerRNA *imaptr);
void uiTemplateImageFormatViews(uiLayout *layout, PointerRNA *imfptr, PointerRNA *ptr);
diff --cc source/blender/editors/interface/interface_layout.c
index a89f91a6b59,d7a892e0e01..062a7681372
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@@ -3525,23 -2870,10 +3525,23 @@@ static void ui_litem_init_from_parent(u
litem->active = true;
litem->enabled = true;
litem->context = layout->context;
- litem->space = (align) ? 0 : layout->root->style->buttonspacex;
litem->redalert = layout->redalert;
litem->w = layout->w;
+ litem->emboss = layout->emboss;
+ litem->item.flag = (layout->item.flag & (UI_ITEM_PROP_SEP | UI_ITEM_PROP_DECORATE));
BLI_addtail(&layout->items, litem);
+}
+
+/* layout create functions */
- uiLayout *uiLayoutRow(uiLayout *layout, int align)
++uiLayout *uiLayoutRow(uiLayout *layout, bool align)
+{
+ uiLayout *litem;
+
+ litem = MEM_callocN(sizeof(uiLayout), "uiLayoutRow");
+ ui_litem_init_from_parent(litem, layout, align);
+
+ litem->item.type = ITEM_LAYOUT_ROW;
+ litem->space = (align) ? 0 : layout->root->style->buttonspacex;
UI_block_layout_set_current(layout->root->block, litem);
@@@ -3568,31 -2906,17 +3568,31 @@@ uiLayout *uiLayoutColumnFlow(uiLayout *
uiLayoutItemFlow *flow;
flow = MEM_callocN(sizeof(uiLayoutItemFlow), "uiLayoutItemFlow");
+ ui_litem_init_from_parent(&flow->litem, layout, align);
+
flow->litem.item.type = ITEM_LAYOUT_COLUMN_FLOW;
- flow->litem.root = layout->root;
- flow->litem.align = align;
- flow->litem.active = true;
- flow->litem.enabled = tr
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list