Commit: 032b42d48de111d48c85a09118966691997d0374
Author: Campbell Barton
Date: Thu Mar 13 06:18:25 2014 +1100
https://developer.blender.org/rB032b42d48de111d48c85a09118966691997d0374
Code cleanup: de-duplicate switch statement, style edits
===================================================================
M source/blender/compositor/nodes/COM_CornerPinNode.cpp
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_regions.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/nodes/composite/nodes/node_composite_cornerpin.c
===================================================================
diff --git a/source/blender/compositor/nodes/COM_CornerPinNode.cpp
b/source/blender/compositor/nodes/COM_CornerPinNode.cpp
index 3115be8..1f4f485 100644
--- a/source/blender/compositor/nodes/COM_CornerPinNode.cpp
+++ b/source/blender/compositor/nodes/COM_CornerPinNode.cpp
@@ -47,7 +47,7 @@ void CornerPinNode::convertToOperations(ExecutionSystem
*graph, CompositorContex
input_image->relinkConnections(warp_image_operation->getInputSocket(0),
0, graph);
for (int i = 0; i < 4; ++i) {
int node_index = node_corner_index[i];
-
getInputSocket(node_index)->relinkConnections(warp_image_operation->getInputSocket(i+1),
+
getInputSocket(node_index)->relinkConnections(warp_image_operation->getInputSocket(i
+ 1),
node_index,
graph);
}
output_warped_image->relinkConnections(warp_image_operation->getOutputSocket());
@@ -59,7 +59,7 @@ void CornerPinNode::convertToOperations(ExecutionSystem
*graph, CompositorContex
/* connect mask op inputs to the same sockets as the warp image op */
for (int i = 0; i < 4; ++i)
addLink(graph,
-
warp_image_operation->getInputSocket(i+1)->getConnection()->getFromSocket(),
+ warp_image_operation->getInputSocket(i +
1)->getConnection()->getFromSocket(),
plane_mask_operation->getInputSocket(i));
output_plane->relinkConnections(plane_mask_operation->getOutputSocket());
diff --git a/source/blender/editors/interface/interface.c
b/source/blender/editors/interface/interface.c
index 744d19d..b8e0002 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1096,7 +1096,7 @@ void uiEndBlock(const bContext *C, uiBlock *block)
block->auto_open_last = block->oldblock->auto_open_last;
block->tooltipdisabled = block->oldblock->tooltipdisabled;
copy_v3_v3(ui_block_hsv_get(block),
- ui_block_hsv_get(block->oldblock));
+ ui_block_hsv_get(block->oldblock));
block->oldblock = NULL;
}
diff --git a/source/blender/editors/interface/interface_regions.c
b/source/blender/editors/interface/interface_regions.c
index 0e966aa..eeb41c8 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1897,10 +1897,6 @@ static void uiBlockPicker(uiBlock *block, float rgba[4],
PointerRNA *ptr, Proper
RNA_property_float_get_array(ptr, prop, rgba);
switch (U.color_picker_type) {
- case USER_CP_CIRCLE_HSV:
- case USER_CP_CIRCLE_HSL:
- circle_picker(block, ptr, prop);
- break;
case USER_CP_SQUARE_SV:
square_picker(block, ptr, prop, UI_GRAD_SV);
break;
@@ -1910,6 +1906,10 @@ static void uiBlockPicker(uiBlock *block, float rgba[4],
PointerRNA *ptr, Proper
case USER_CP_SQUARE_HV:
square_picker(block, ptr, prop, UI_GRAD_HV);
break;
+
+ /* user default */
+ case USER_CP_CIRCLE_HSV:
+ case USER_CP_CIRCLE_HSL:
default:
circle_picker(block, ptr, prop);
break;
diff --git a/source/blender/editors/interface/interface_templates.c
b/source/blender/editors/interface/interface_templates.c
index a7be32a..a493751 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2240,11 +2240,6 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA
*ptr, const char *propna
row = uiLayoutRow(col, true);
switch (U.color_picker_type) {
- case USER_CP_CIRCLE_HSV:
- case USER_CP_CIRCLE_HSL:
- but = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0,
WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
- -1, 0.0, 0.0, 0, 0, "");
- break;
case USER_CP_SQUARE_SV:
but = uiDefButR_prop(block, HSVCUBE, 0, "", 0, 0,
WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
-1, 0.0, 0.0, UI_GRAD_SV, 0, "");
@@ -2257,9 +2252,13 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA
*ptr, const char *propna
but = uiDefButR_prop(block, HSVCUBE, 0, "", 0, 0,
WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
-1, 0.0, 0.0, UI_GRAD_HV, 0, "");
break;
+
+ /* user default */
+ case USER_CP_CIRCLE_HSV:
+ case USER_CP_CIRCLE_HSL:
default:
but = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0,
WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
- -1, 0.0, 0.0,
0, 0, "");
+ -1, 0.0, 0.0, 0, 0, "");
break;
}
@@ -2281,15 +2280,10 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA
*ptr, const char *propna
if (value_slider) {
switch (U.color_picker_type) {
- case USER_CP_CIRCLE_HSV:
- uiItemS(row);
- uiDefButR_prop(block, HSVCUBE, 0, "",
WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop,
- -1, softmin, softmax,
UI_GRAD_V_ALT, 0, "");
- break;
case USER_CP_CIRCLE_HSL:
uiItemS(row);
uiDefButR_prop(block, HSVCUBE, 0, "",
WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop,
- -1, softmin,
softmax, UI_GRAD_L_ALT, 0, "");
+ -1, softmin, softmax,
UI_GRAD_L_ALT, 0, "");
break;
case USER_CP_SQUARE_SV:
uiItemS(col);
@@ -2306,10 +2300,13 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA
*ptr, const char *propna
uiDefButR_prop(block, HSVCUBE, 0, "", 0, 4,
WHEEL_SIZE, 18, ptr, prop,
-1, softmin, softmax, UI_GRAD_HV
+ 3, 0, "");
break;
+
+ /* user default */
+ case USER_CP_CIRCLE_HSV:
default:
uiItemS(row);
uiDefButR_prop(block, HSVCUBE, 0, "",
WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop,
- -1, softmin,
softmax, UI_GRAD_V_ALT, 0, "");
+ -1, softmin, softmax,
UI_GRAD_V_ALT, 0, "");
break;
}
}
diff --git a/source/blender/editors/transform/transform_conversions.c
b/source/blender/editors/transform/transform_conversions.c
index 9aa00ae..cf0e202 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -3012,7 +3012,10 @@ static int gpf_cmp_frame(void *thunk, void *a, void *b)
*((bool *)thunk) = true;
/* selected last */
if ((frame_a->flag & GP_FRAME_SELECT) &&
- ((frame_b->flag & GP_FRAME_SELECT) == 0)) return 1;
+ ((frame_b->flag & GP_FRAME_SELECT) == 0))
+ {
+ return 1;
+ }
return 0;
}
@@ -3026,7 +3029,10 @@ static int masklay_shape_cmp_frame(void *thunk, void *a,
void *b)
*((bool *)thunk) = true;
/* selected last */
if ((frame_a->flag & MASK_SHAPE_SELECT) &&
- ((frame_b->flag & MASK_SHAPE_SELECT) == 0)) return 1;
+ ((frame_b->flag & MASK_SHAPE_SELECT) == 0))
+ {
+ return 1;
+ }
return 0;
}
diff --git a/source/blender/makesrna/intern/rna_nodetree.c
b/source/blender/makesrna/intern/rna_nodetree.c
index 080652f..8fbb915 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3430,13 +3430,13 @@ static void def_sh_tex_image(StructRNA *srna)
static const EnumPropertyItem prop_interpolation_items[] = {
{SHD_INTERP_LINEAR, "Linear", 0, "Linear",
- "Linear interpolation"},
+ "Linear interpolation"},
{SHD_INTERP_CLOSEST, "Closest", 0, "Closest",
- "No interpolation (sample
closest texel"},
- {SHD_INTERP_CUBIC, "Cubic", 0, "Cubic",
- "Cubic interpolation (OSL
only)"},
- {SHD_INTERP_SMART, "Smart", 0, "Smart",
- "Bicubic when maxifying, else
bilinear (OSL only)"},
+ "No interpolation (sample closest texel"},
+ {SHD_INTERP_CUBIC, "Cubic", 0, "Cubic",
+ "Cubic interpolation (OSL only)"},
+ {SHD_INTERP_SMART, "Smart", 0, "Smart",
+ "Bicubic when maxifying, else bilinear
(OSL only)"},
{0, NULL, 0, NULL, NULL}
};
diff --git a/source/blender/nodes/composite/nodes/node_composite_cornerpin.c
b/source/blender/nodes/composite/nodes/node_composite_cornerpin.c
index 851bf92..9758e32 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cornerpin.c
+++ b/source/blender/nodes/composite/nodes/node_composite_cornerpin.c
@@ -26,7 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/nodes/composite/nodes/node_composite_planetrackdeform.c
+/** \file blender/nodes/composite/nodes/node_composite_cornerpin.c
* \ingroup cmpnodes
*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
