forked from bartvdbraak/blender
Cleanup: indentation, long lines
This commit is contained in:
parent
5ccaef6d67
commit
00c4f49a6d
@ -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)
|
||||
|
||||
|
@ -531,17 +531,17 @@ class CyclesRender_PT_layer_passes(CyclesButtonsPanel, Panel):
|
||||
col.prop(rl, "use_pass_environment")
|
||||
|
||||
if context.scene.cycles.feature_set == 'EXPERIMENTAL':
|
||||
col.separator()
|
||||
sub = col.column()
|
||||
sub.active = crl.use_denoising
|
||||
sub.prop(crl, "denoising_store_passes", text="Denoising")
|
||||
col.separator()
|
||||
sub = col.column()
|
||||
sub.active = crl.use_denoising
|
||||
sub.prop(crl, "denoising_store_passes", text="Denoising")
|
||||
|
||||
if _cycles.with_cycles_debug:
|
||||
col = layout.column()
|
||||
col.prop(crl, "pass_debug_bvh_traversed_nodes")
|
||||
col.prop(crl, "pass_debug_bvh_traversed_instances")
|
||||
col.prop(crl, "pass_debug_bvh_intersections")
|
||||
col.prop(crl, "pass_debug_ray_bounces")
|
||||
col = layout.column()
|
||||
col.prop(crl, "pass_debug_bvh_traversed_nodes")
|
||||
col.prop(crl, "pass_debug_bvh_traversed_instances")
|
||||
col.prop(crl, "pass_debug_bvh_intersections")
|
||||
col.prop(crl, "pass_debug_ray_bounces")
|
||||
|
||||
|
||||
class CyclesRender_PT_views(CyclesButtonsPanel, Panel):
|
||||
@ -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)
|
||||
|
@ -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"
|
||||
|
@ -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()
|
||||
|
@ -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);
|
||||
|
@ -790,7 +790,7 @@ static void default_get_tarmat(bConstraint *con, bConstraintOb *UNUSED(cob), bCo
|
||||
ct = ctn; \
|
||||
} \
|
||||
} (void)0
|
||||
|
||||
|
||||
/* --------- ChildOf Constraint ------------ */
|
||||
|
||||
static void childof_new_data(void *cdata)
|
||||
|
@ -986,19 +986,19 @@ 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:
|
||||
* Forcefields: Gravity-like attractor
|
||||
* (force power is related to the inverse of distance to the power of a falloff value)
|
||||
* Vortex fields: swirling effectors
|
||||
* (particles rotate around Z-axis of the object. otherwise, same relation as)
|
||||
* (Forcefields, but this is not done through a force/acceleration)
|
||||
* Guide: particles on a path
|
||||
* (particles are guided along a curve bezier or old nurbs)
|
||||
* (is independent of other effectors)
|
||||
*/
|
||||
/*
|
||||
* Modifies the force on a particle according to its
|
||||
* relation with the effector object
|
||||
* Different kind of effectors include:
|
||||
* Forcefields: Gravity-like attractor
|
||||
* (force power is related to the inverse of distance to the power of a falloff value)
|
||||
* Vortex fields: swirling effectors
|
||||
* (particles rotate around Z-axis of the object. otherwise, same relation as)
|
||||
* (Forcefields, but this is not done through a force/acceleration)
|
||||
* Guide: particles on a path
|
||||
* (particles are guided along a curve bezier or old nurbs)
|
||||
* (is independent of other effectors)
|
||||
*/
|
||||
EffectorCache *eff;
|
||||
EffectorData efd;
|
||||
int p=0, tot = 1, step = 1;
|
||||
|
@ -2863,7 +2863,7 @@ bool BKE_image_is_stereo(Image *ima)
|
||||
{
|
||||
return BKE_image_is_multiview(ima) &&
|
||||
(BLI_findstring(&ima->views, STEREO_LEFT_NAME, offsetof(ImageView, name)) &&
|
||||
BLI_findstring(&ima->views, STEREO_RIGHT_NAME, offsetof(ImageView, name)));
|
||||
BLI_findstring(&ima->views, STEREO_RIGHT_NAME, offsetof(ImageView, name)));
|
||||
}
|
||||
|
||||
static void image_init_multilayer_multiview(Image *ima, RenderResult *rr)
|
||||
|
@ -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);
|
||||
|
@ -590,7 +590,7 @@ void psys_free(Object *ob, ParticleSystem *psys)
|
||||
|
||||
BLI_bvhtree_free(psys->bvhtree);
|
||||
BLI_kdtree_free(psys->tree);
|
||||
|
||||
|
||||
if (psys->fluid_springs)
|
||||
MEM_freeN(psys->fluid_springs);
|
||||
|
||||
|
@ -1113,7 +1113,7 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode)
|
||||
GPU_pbvh_bmesh_buffers_build(bvh->flags & PBVH_DYNTOPO_SMOOTH_SHADING);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
node->flag &= ~PBVH_RebuildDrawBuffers;
|
||||
}
|
||||
|
||||
|
@ -684,7 +684,7 @@ static float invGammaCorrect(float c)
|
||||
else if (i >= RE_GAMMA_TABLE_SIZE) res = powf(c, valid_inv_gamma);
|
||||
else res = inv_gamma_range_table[i] +
|
||||
((c - color_domain_table[i]) * inv_gamfactor_table[i]);
|
||||
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
@ -1775,7 +1775,7 @@ static ImBuf *seq_proxy_fetch(const SeqRenderData *context, Sequence *seq, int c
|
||||
if (proxy->anim == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
seq_open_anim_file(context->scene, seq, true);
|
||||
sanim = seq->anims.first;
|
||||
|
||||
@ -1783,7 +1783,7 @@ static ImBuf *seq_proxy_fetch(const SeqRenderData *context, Sequence *seq, int c
|
||||
|
||||
return IMB_anim_absolute(proxy->anim, frameno, IMB_TC_NONE, IMB_PROXY_NONE);
|
||||
}
|
||||
|
||||
|
||||
if (seq_proxy_get_fname(ed, seq, cfra, render_size, name, context->view_id) == 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
@ -2235,9 +2235,9 @@ 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 !
|
||||
* this will ruin adaptive stepsize AKA heun! (BM)
|
||||
*/
|
||||
/* 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 */
|
||||
/*BodyPoint *bproot;*/ /* UNUSED */
|
||||
ListBase *do_effector = NULL;
|
||||
|
@ -203,7 +203,7 @@ static float get_animated_scaleinf(StabContext *ctx, int framenr)
|
||||
|
||||
static void get_animated_target_pos(StabContext *ctx,
|
||||
int framenr,
|
||||
float target_pos[2])
|
||||
float target_pos[2])
|
||||
{
|
||||
target_pos[0] = fetch_from_fcurve(ctx->target_pos[0],
|
||||
framenr,
|
||||
|
@ -137,8 +137,8 @@ void _bli_array_grow_func(void **arr_p, const void *arr_static,
|
||||
|
||||
#define BLI_array_free(arr) \
|
||||
if (arr && (char *)arr != _##arr##_static) { \
|
||||
BLI_array_fake_user(arr); \
|
||||
MEM_freeN(arr); \
|
||||
BLI_array_fake_user(arr); \
|
||||
MEM_freeN(arr); \
|
||||
} (void)0
|
||||
|
||||
#define BLI_array_pop(arr) ( \
|
||||
|
@ -1560,7 +1560,7 @@ BArrayState *BLI_array_store_state_add(
|
||||
const void *data, const size_t data_len,
|
||||
const BArrayState *state_reference)
|
||||
{
|
||||
/* ensure we're aligned to the stride */
|
||||
/* ensure we're aligned to the stride */
|
||||
BLI_assert((data_len % bs->info.chunk_stride) == 0);
|
||||
|
||||
#ifdef USE_PARANOID_CHECKS
|
||||
|
@ -422,13 +422,13 @@ void BLI_file_free_lines(LinkNode *lines)
|
||||
bool BLI_file_older(const char *file1, const char *file2)
|
||||
{
|
||||
#ifdef WIN32
|
||||
struct _stat st1, st2;
|
||||
struct _stat st1, st2;
|
||||
|
||||
UTF16_ENCODE(file1);
|
||||
UTF16_ENCODE(file2);
|
||||
|
||||
if (_wstat(file1_16, &st1)) return false;
|
||||
if (_wstat(file2_16, &st2)) return false;
|
||||
if (_wstat(file2_16, &st2)) return false;
|
||||
|
||||
UTF16_UN_ENCODE(file2);
|
||||
UTF16_UN_ENCODE(file1);
|
||||
|
@ -1127,7 +1127,7 @@ static void task_parallel_range_ex(
|
||||
atomic_fetch_and_add_uint32((uint32_t *)(&state.iter), 0);
|
||||
|
||||
if (use_userdata_chunk) {
|
||||
userdata_chunk_array = MALLOCA(userdata_chunk_size * num_tasks);
|
||||
userdata_chunk_array = MALLOCA(userdata_chunk_size * num_tasks);
|
||||
}
|
||||
|
||||
for (i = 0; i < num_tasks; i++) {
|
||||
|
@ -10159,7 +10159,7 @@ void BLO_library_link_copypaste(Main *mainl, BlendHandle *bh)
|
||||
|
||||
static ID *link_named_part_ex(
|
||||
Main *mainl, FileData *fd, const short idcode, const char *name, const short flag,
|
||||
Scene *scene, View3D *v3d, const bool use_placeholders, const bool force_indirect)
|
||||
Scene *scene, View3D *v3d, const bool use_placeholders, const bool force_indirect)
|
||||
{
|
||||
ID *id = link_named_part(mainl, fd, idcode, name, use_placeholders, force_indirect);
|
||||
|
||||
|
@ -452,7 +452,7 @@ void ANIM_editkeyframes_refresh(bAnimContext *ac)
|
||||
ok |= KEYFRAME_OK_H2; \
|
||||
} \
|
||||
} (void)0
|
||||
|
||||
|
||||
/* ------------------------ */
|
||||
|
||||
static short ok_bezier_frame(KeyframeEditData *ked, BezTriple *bezt)
|
||||
|
@ -383,8 +383,8 @@ void WM_OT_alembic_export(wmOperatorType *ot)
|
||||
"Enable this to run the import in the background, disable to block Blender while importing");
|
||||
|
||||
/* This dummy prop is used to check whether we need to init the start and
|
||||
* end frame values to that of the scene's, otherwise they are reset at
|
||||
* every change, draw update. */
|
||||
* end frame values to that of the scene's, otherwise they are reset at
|
||||
* every change, draw update. */
|
||||
RNA_def_boolean(ot->srna, "init_scene_frame_range", false, "", "");
|
||||
}
|
||||
|
||||
|
@ -279,10 +279,10 @@ void DPAINT_OT_output_toggle(wmOperatorType *ot)
|
||||
/***************************** Image Sequence Baking ******************************/
|
||||
|
||||
typedef struct DynamicPaintBakeJob {
|
||||
/* from wmJob */
|
||||
void *owner;
|
||||
short *stop, *do_update;
|
||||
float *progress;
|
||||
/* from wmJob */
|
||||
void *owner;
|
||||
short *stop, *do_update;
|
||||
float *progress;
|
||||
|
||||
struct Main *bmain;
|
||||
Scene *scene;
|
||||
@ -297,13 +297,13 @@ typedef struct DynamicPaintBakeJob {
|
||||
|
||||
static void dpaint_bake_free(void *customdata)
|
||||
{
|
||||
DynamicPaintBakeJob *job = customdata;
|
||||
MEM_freeN(job);
|
||||
DynamicPaintBakeJob *job = customdata;
|
||||
MEM_freeN(job);
|
||||
}
|
||||
|
||||
static void dpaint_bake_endjob(void *customdata)
|
||||
{
|
||||
DynamicPaintBakeJob *job = customdata;
|
||||
DynamicPaintBakeJob *job = customdata;
|
||||
DynamicPaintCanvasSettings *canvas = job->canvas;
|
||||
|
||||
canvas->flags &= ~MOD_DPAINT_BAKING;
|
||||
@ -311,7 +311,7 @@ static void dpaint_bake_endjob(void *customdata)
|
||||
dynamicPaint_freeSurfaceData(job->surface);
|
||||
|
||||
G.is_rendering = false;
|
||||
BKE_spacedata_draw_locks(false);
|
||||
BKE_spacedata_draw_locks(false);
|
||||
|
||||
WM_set_locked_interface(G.main->wm.first, false);
|
||||
|
||||
@ -421,26 +421,26 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job)
|
||||
|
||||
static void dpaint_bake_startjob(void *customdata, short *stop, short *do_update, float *progress)
|
||||
{
|
||||
DynamicPaintBakeJob *job = customdata;
|
||||
DynamicPaintBakeJob *job = customdata;
|
||||
|
||||
job->stop = stop;
|
||||
job->do_update = do_update;
|
||||
job->progress = progress;
|
||||
job->stop = stop;
|
||||
job->do_update = do_update;
|
||||
job->progress = progress;
|
||||
job->start = PIL_check_seconds_timer();
|
||||
job->success = 1;
|
||||
|
||||
G.is_break = false; /* reset BKE_blender_test_break*/
|
||||
G.is_break = false; /* reset BKE_blender_test_break*/
|
||||
|
||||
/* XXX annoying hack: needed to prevent data corruption when changing
|
||||
* scene frame in separate threads
|
||||
*/
|
||||
G.is_rendering = true;
|
||||
BKE_spacedata_draw_locks(true);
|
||||
*/
|
||||
G.is_rendering = true;
|
||||
BKE_spacedata_draw_locks(true);
|
||||
|
||||
dynamicPaint_bakeImageSequence(job);
|
||||
|
||||
*do_update = true;
|
||||
*stop = 0;
|
||||
*do_update = true;
|
||||
*stop = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -99,45 +99,45 @@ static int ptcache_job_break(void *customdata)
|
||||
|
||||
static void ptcache_job_update(void *customdata, float progress, int *cancel)
|
||||
{
|
||||
PointCacheJob *job = customdata;
|
||||
PointCacheJob *job = customdata;
|
||||
|
||||
if (ptcache_job_break(job)) {
|
||||
*cancel = 1;
|
||||
}
|
||||
if (ptcache_job_break(job)) {
|
||||
*cancel = 1;
|
||||
}
|
||||
|
||||
*(job->do_update) = true;
|
||||
*(job->progress) = progress;
|
||||
*(job->do_update) = true;
|
||||
*(job->progress) = progress;
|
||||
}
|
||||
|
||||
static void ptcache_job_startjob(void *customdata, short *stop, short *do_update, float *progress)
|
||||
{
|
||||
PointCacheJob *job = customdata;
|
||||
PointCacheJob *job = customdata;
|
||||
|
||||
job->stop = stop;
|
||||
job->do_update = do_update;
|
||||
job->progress = progress;
|
||||
job->stop = stop;
|
||||
job->do_update = do_update;
|
||||
job->progress = progress;
|
||||
|
||||
G.is_break = false;
|
||||
G.is_break = false;
|
||||
|
||||
/* XXX annoying hack: needed to prevent data corruption when changing
|
||||
* scene frame in separate threads
|
||||
*/
|
||||
G.is_rendering = true;
|
||||
BKE_spacedata_draw_locks(true);
|
||||
/* XXX annoying hack: needed to prevent data corruption when changing
|
||||
* scene frame in separate threads
|
||||
*/
|
||||
G.is_rendering = true;
|
||||
BKE_spacedata_draw_locks(true);
|
||||
|
||||
BKE_ptcache_bake(job->baker);
|
||||
|
||||
*do_update = true;
|
||||
*stop = 0;
|
||||
*do_update = true;
|
||||
*stop = 0;
|
||||
}
|
||||
|
||||
static void ptcache_job_endjob(void *customdata)
|
||||
{
|
||||
PointCacheJob *job = customdata;
|
||||
PointCacheJob *job = customdata;
|
||||
Scene *scene = job->baker->scene;
|
||||
|
||||
G.is_rendering = false;
|
||||
BKE_spacedata_draw_locks(false);
|
||||
G.is_rendering = false;
|
||||
BKE_spacedata_draw_locks(false);
|
||||
|
||||
WM_set_locked_interface(G.main->wm.first, false);
|
||||
|
||||
|
@ -552,7 +552,7 @@ void nla_buttons_register(ARegionType *art)
|
||||
pt = MEM_callocN(sizeof(PanelType), "spacetype nla panel modifiers");
|
||||
strcpy(pt->idname, "NLA_PT_modifiers");
|
||||
strcpy(pt->label, N_("Modifiers"));
|
||||
strcpy(pt->category, "Modifiers");
|
||||
strcpy(pt->category, "Modifiers");
|
||||
strcpy(pt->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA);
|
||||
pt->draw = nla_panel_modifiers;
|
||||
pt->poll = nla_strip_eval_panel_poll;
|
||||
|
@ -683,7 +683,7 @@ static int sequencer_select_less_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
|
||||
if (!select_more_less_seq__internal(scene, false, false))
|
||||
return OPERATOR_CANCELLED;
|
||||
|
||||
|
||||
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER | NA_SELECTED, scene);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
|
@ -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;
|
||||
|
@ -2859,7 +2859,7 @@ static PBool p_chart_symmetry_pins(PChart *chart, PEdge *outer, PVert **pin1, PV
|
||||
PEdge *cure = NULL, *firste1 = NULL, *firste2 = NULL, *nextbe;
|
||||
float maxlen = 0.0f, curlen = 0.0f, totlen = 0.0f, firstlen = 0.0f;
|
||||
float len1, len2;
|
||||
|
||||
|
||||
/* find longest series of verts split in the chart itself, these are
|
||||
* marked during construction */
|
||||
be = outer;
|
||||
|
@ -6446,7 +6446,7 @@ static int rna_function_parameter_parse(PointerRNA *ptr, PropertyRNA *prop, Prop
|
||||
tid, fid, pid, RNA_struct_identifier(ptype), RNA_struct_identifier(srna));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
*((void **)dest) = *((void **)src);
|
||||
|
||||
break;
|
||||
|
@ -2095,7 +2095,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
|
||||
RNA_def_property_ui_text(prop, "Even Distribution",
|
||||
"Use even distribution from faces based on face areas or edge lengths");
|
||||
RNA_def_property_update(prop, 0, "rna_Particle_reset");
|
||||
|
||||
|
||||
prop = RNA_def_property(srna, "use_die_on_collision", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_DIE_ON_COL);
|
||||
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -56,7 +56,7 @@ static PyStructSequence_Field app_sdl_info_fields[] = {
|
||||
{(char *)"available", (char *)("Boolean, True when SDL is available. This is False when "
|
||||
"either *supported* is False, or *dynload* is True and "
|
||||
"Blender cannot find the correct library.")},
|
||||
{NULL}
|
||||
{NULL}
|
||||
};
|
||||
|
||||
static PyStructSequence_Desc app_sdl_info_desc = {
|
||||
|
@ -398,7 +398,7 @@ void InitAtmosphere(struct SunSky *sunSky, float sun_intens, float mief, float r
|
||||
vLambda2[0] = fLambda2[0];
|
||||
vLambda2[1] = fLambda2[1];
|
||||
vLambda2[2] = fLambda2[2];
|
||||
|
||||
|
||||
vLambda4[0] = fLambda4[0];
|
||||
vLambda4[1] = fLambda4[1];
|
||||
vLambda4[2] = fLambda4[2];
|
||||
|
@ -1093,7 +1093,7 @@ static int wm_file_write(bContext *C, const char *filepath, int fileflags, Repor
|
||||
BKE_reportf(reports, RPT_ERROR, "Cannot save blend file, path '%s' is not writable", filepath);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/* note: used to replace the file extension (to ensure '.blend'),
|
||||
* no need to now because the operator ensures,
|
||||
* its handy for scripts to save to a predefined name without blender editing it */
|
||||
|
@ -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
|
||||
|
||||
|
@ -80,5 +80,6 @@ def main():
|
||||
import sys
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
@ -178,5 +178,6 @@ def main():
|
||||
"--max-line-length=1000"
|
||||
" '%s'" % f)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
@ -127,5 +127,6 @@ def api_dump(use_properties=True, use_functions=True):
|
||||
|
||||
print("END")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
api_dump()
|
||||
|
Loading…
Reference in New Issue
Block a user