sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: indentation, long lines

Browse Source
This commit is contained in:
Campbell Barton 2017-06-12 13:35:00 +10:00
parent 5ccaef6d67
commit 00c4f49a6d
38 changed files with 111 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/blender/addon/properties.py
View File

@ -695,7 +695,11 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
update=devices_update_callback
)
cls.debug_opencl_kernel_single_program = BoolProperty(name="Single Program", default=True, update=devices_update_callback);
cls.debug_opencl_kernel_single_program = BoolProperty(
name="Single Program",
default=True,
update=devices_update_callback,
)
cls.debug_use_opencl_debug = BoolProperty(name="Debug OpenCL", default=False)

2
intern/cycles/blender/addon/ui.py
View File

@ -1710,7 +1710,7 @@ def draw_device(self, context):
layout.prop(cscene, "feature_set")
split = layout.split(percentage=1/3)
split = layout.split(percentage=1 / 3)
split.label("Device:")
row = split.row()
row.active = show_device_active(context)

4
release/scripts/modules/bl_i18n_utils/settings.py
View File

@ -118,7 +118,7 @@ MSG_COMMENT_PREFIX = "#~ "
MSG_CONTEXT_PREFIX = "MSGCTXT:"
# The default comment prefix used in po's.
PO_COMMENT_PREFIX= "# "
PO_COMMENT_PREFIX = "# "
# The comment prefix used to mark sources of msgids, in po's.
PO_COMMENT_PREFIX_SOURCE = "#: "
@ -130,7 +130,7 @@ PO_COMMENT_PREFIX_SOURCE_CUSTOM = "#. :src: "
PO_COMMENT_PREFIX_GENERATED = "#. "
# The comment prefix used to comment entries in po's.
PO_COMMENT_PREFIX_MSG= "#~ "
PO_COMMENT_PREFIX_MSG = "#~ "
# The comment prefix used to mark fuzzy msgids, in po's.
PO_COMMENT_FUZZY = "#, fuzzy"

2
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -127,7 +127,7 @@ class USERPREF_MT_app_templates(Menu):
text=bpy.path.display_name(d),
)
props.use_splash = True
props.app_template = d;
props.app_template = d
if use_install:
layout.separator()

3
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -3322,7 +3322,8 @@ void DM_calc_loop_tangents_step_0(
const CustomData *loopData, bool calc_active_tangent,
const char (*tangent_names)[MAX_NAME], int tangent_names_count,
bool *rcalc_act, bool *rcalc_ren, int *ract_uv_n, int *rren_uv_n,
char *ract_uv_name, char *rren_uv_name, char *rtangent_mask) {
char *ract_uv_name, char *rren_uv_name, char *rtangent_mask)
{
/* Active uv in viewport */
int layer_index = CustomData_get_layer_index(loopData, CD_MLOOPUV);
*ract_uv_n = CustomData_get_active_layer(loopData, CD_MLOOPUV);

2
source/blender/blenkernel/intern/effect.c
View File

@ -986,7 +986,7 @@ static void do_physical_effector(EffectorCache *eff, EffectorData *efd, Effected
*/
void pdDoEffectors(ListBase *effectors, ListBase *colliders, EffectorWeights *weights, EffectedPoint *point, float *force, float *impulse)
{
/*
/*
* Modifies the force on a particle according to its
* relation with the effector object
* Different kind of effectors include:

2
source/blender/blenkernel/intern/ocean.c
View File

@ -334,10 +334,10 @@ void BKE_ocean_eval_uv(struct Ocean *oc, struct OceanResult *ocr, float u, float
i1 = i1 % oc->_M;
j1 = j1 % oc->_N;
#define BILERP(m) (interpf(interpf(m[i1 * oc->_N + j1], m[i0 * oc->_N + j1], frac_x), \
interpf(m[i1 * oc->_N + j0], m[i0 * oc->_N + j0], frac_x), \
frac_z))
{
if (oc->_do_disp_y) {
ocr->disp[1] = BILERP(oc->_disp_y);

2
source/blender/blenkernel/intern/softbody.c
View File

@ -2235,7 +2235,7 @@ static void sb_cf_threads_run(Scene *scene, Object *ob, float forcetime, float t
static void softbody_calc_forcesEx(Scene *scene, Object *ob, float forcetime, float timenow)
{
/* rule we never alter free variables :bp->vec bp->pos in here !
/* rule we never alter free variables :bp->vec bp->pos in here !
* this will ruin adaptive stepsize AKA heun! (BM)
*/
SoftBody *sb= ob->soft; /* is supposed to be there */

2
source/blender/editors/transform/transform_generics.c
View File

@ -971,7 +971,7 @@ static void recalcData_sequencer(TransInfo *t)
/* force recalculation of triangles during transformation */
static void recalcData_gpencil_strokes(TransInfo *t)
{
{
TransData *td = t->data;
for (int i = 0; i < t->total; i++, td++) {
bGPDstroke *gps = td->extra;

6
source/blender/nodes/shader/nodes/node_shader_normal_map.c
View File

@ -46,8 +46,10 @@ static void node_shader_init_normal_map(bNodeTree *UNUSED(ntree), bNode *node)
node->storage = attr;
}
static void node_shader_exec_normal_map(void *data, int UNUSED(thread), bNode *node, bNodeExecData *UNUSED(execdata), bNodeStack **in, bNodeStack **out)
{
static void node_shader_exec_normal_map(
void *data, int UNUSED(thread), bNode *node, bNodeExecData *UNUSED(execdata),
bNodeStack **in, bNodeStack **out)
{
if (data) {
ShadeInput *shi = ((ShaderCallData *)data)->shi;

2
tests/python/bl_alembic_import_test.py
View File

@ -207,7 +207,7 @@ def main():
import argparse
if '--' in sys.argv:
argv = [sys.argv[0]] + sys.argv[sys.argv.index('--')+1:]
argv = [sys.argv[0]] + sys.argv[sys.argv.index('--') + 1:]
else:
argv = sys.argv

1
tests/python/bl_keymap_completeness.py
View File

@ -80,5 +80,6 @@ def main():
import sys
sys.exit(1)
if __name__ == "__main__":
main()

1
tests/python/pep8.py
View File

@ -178,5 +178,6 @@ def main():
"--max-line-length=1000"
" '%s'" % f)
if __name__ == "__main__":
main()

1
tests/python/rna_info_dump.py
View File

@ -127,5 +127,6 @@ def api_dump(use_properties=True, use_functions=True):
print("END")
if __name__ == "__main__":
api_dump()