blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

ClangFormat: run with ReflowComments on source/ 

Prepare for enabling ReflowComments.
This commit is contained in:
Campbell Barton 2019-05-01 11:09:22 +10:00
parent f70470b540
commit 909665a0d4
184 changed files with 528 additions and 505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/avi/AVI_avi.h
View File

@ -63,12 +63,18 @@ typedef struct _AviMainHeader {
int MaxBytesPerSec; /* MaxBytesPerSec - approx bps system must handle */
int PaddingGranularity;
int Flags;
#define AVIF_HASINDEX 0x00000010 /* had idx1 chunk */
#define AVIF_MUSTUSEINDEX 0x00000020 /* must use idx1 chunk to determine order */
#define AVIF_ISINTERLEAVED 0x00000100 /* AVI file is interleaved */
/** had idx1 chunk */
#define AVIF_HASINDEX 0x00000010
/** must use idx1 chunk to determine order */
#define AVIF_MUSTUSEINDEX 0x00000020
/** AVI file is interleaved */
#define AVIF_ISINTERLEAVED 0x00000100
#define AVIF_TRUSTCKTYPE 0x00000800
#define AVIF_WASCAPTUREFILE 0x00010000 /* specially allocated used for capturing real time video */
#define AVIF_COPYRIGHTED 0x00020000 /* contains copyrighted data */
/** specially allocated used for capturing real time video */
#define AVIF_WASCAPTUREFILE 0x00010000
/** contains copyrighted data */
#define AVIF_COPYRIGHTED 0x00020000
int TotalFrames;
int InitialFrames; /* InitialFrames - initial frame before interleaving */

11
source/blender/blenkernel/BKE_particle.h
View File

@ -201,21 +201,24 @@ typedef struct ParticleCollisionElement {
short inv_nor, inside;
} ParticleCollisionElement;
/* container for moving data between deflet_particle and particle_intersect_face */
/** Container for moving data between deflet_particle and particle_intersect_face. */
typedef struct ParticleCollision {
struct Object *current;
struct Object *hit;
struct Object *skip[PARTICLE_COLLISION_MAX_COLLISIONS + 1];
struct Object *emitter;
struct CollisionModifierData *md; // collision modifier for current object;
/** Collision modifier for current object. */
struct CollisionModifierData *md;
float f; // time factor of previous collision, needed for substracting face velocity
/** Time factor of previous collision, needed for substracting face velocity. */
float f;
float fac1, fac2;
float cfra, old_cfra;
float original_ray_length; //original length of co2-co1, needed for collision time evaluation
/** Original length of co2-co1, needed for collision time evaluation. */
float original_ray_length;
int skip_count;

4
source/blender/blenkernel/BKE_pbvh.h
View File

@ -400,8 +400,8 @@ void BKE_pbvh_node_get_bm_orco_data(PBVHNode *node,
bool BKE_pbvh_node_vert_update_check_any(PBVH *bvh, PBVHNode *node);
//void BKE_pbvh_node_BB_reset(PBVHNode *node);
//void BKE_pbvh_node_BB_expand(PBVHNode *node, float co[3]);
// void BKE_pbvh_node_BB_reset(PBVHNode *node);
// void BKE_pbvh_node_BB_expand(PBVHNode *node, float co[3]);
bool pbvh_has_mask(PBVH *bvh);
void pbvh_show_diffuse_color_set(PBVH *bvh, bool show_diffuse_color);

4
source/blender/blenkernel/BKE_softbody.h
View File

@ -37,8 +37,8 @@ typedef struct BodyPoint {
int *springs;
float choke, choke2, frozen;
float colball;
short loc_flag; //reserved by locale module specific states
//char octantflag;
short loc_flag; // reserved by locale module specific states
// char octantflag;
float mass;
float springweight;
} BodyPoint;

2
source/blender/blenkernel/BKE_unit.h
View File

@ -63,7 +63,7 @@ double bUnit_BaseScalar(int system, int type);
bool bUnit_IsValid(int system, int type);
/* loop over scales, could add names later */
//double bUnit_Iter(void **unit, char **name, int system, int type);
// double bUnit_Iter(void **unit, char **name, int system, int type);
void bUnit_GetSystem(int system, int type, void const **r_usys_pt, int *r_len);
int bUnit_GetBaseUnit(const void *usys_pt);

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

@ -480,7 +480,7 @@ int where_on_path(Object *ob,
* which used to temporary set CU_FOLLOW flag for the curve and no
* longer does it (because of threading issues of such a thing.
*/
//if (cu->flag & CU_FOLLOW) {
// if (cu->flag & CU_FOLLOW) {
key_curve_tangent_weights(1.0f - fac, data, KEY_BSPLINE);

20
source/blender/blenkernel/intern/anim_sys.c
View File

@ -3906,10 +3906,10 @@ void BKE_animsys_evaluate_all_animation(Main *main,
}
/* macros for less typing
* - only evaluate animation data for id if it has users (and not just fake ones)
* - whether animdata exists is checked for by the evaluation function, though taking
* this outside of the function may make things slightly faster?
*/
* - only evaluate animation data for id if it has users (and not just fake ones)
* - whether animdata exists is checked for by the evaluation function, though taking
* this outside of the function may make things slightly faster?
*/
#define EVAL_ANIM_IDS(first, aflag) \
for (id = first; id; id = id->next) { \
if (ID_REAL_USERS(id) > 0) { \
@ -3920,11 +3920,11 @@ void BKE_animsys_evaluate_all_animation(Main *main,
(void)0
/* another macro for the "embedded" nodetree cases
* - this is like EVAL_ANIM_IDS, but this handles the case "embedded nodetrees"
* (i.e. scene/material/texture->nodetree) which we need a special exception
* for, otherwise they'd get skipped
* - ntp = "node tree parent" = datablock where node tree stuff resides
*/
* - this is like EVAL_ANIM_IDS, but this handles the case "embedded nodetrees"
* (i.e. scene/material/texture->nodetree) which we need a special exception
* for, otherwise they'd get skipped
* - ntp = "node tree parent" = datablock where node tree stuff resides
*/
#define EVAL_ANIM_NODETREE_IDS(first, NtId_Type, aflag) \
for (id = first; id; id = id->next) { \
if (ID_REAL_USERS(id) > 0) { \
@ -4096,7 +4096,7 @@ void BKE_animsys_eval_driver(Depsgraph *depsgraph,
/* evaluate this using values set already in other places
* NOTE: for 'layering' option later on, we should check if we should remove old value before
* adding new to only be done when drivers only changed */
//printf("\told val = %f\n", fcu->curval);
// printf("\told val = %f\n", fcu->curval);
PathResolvedRNA anim_rna;
if (animsys_store_rna_setting(&id_ptr, fcu->rna_path, fcu->array_index, &anim_rna)) {

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

@ -157,7 +157,7 @@ static bool test_path(char *targetpath,
#ifdef PATH_DEBUG
printf("\t%s missing: %s\n", __func__, targetpath);
#endif
//targetpath[0] = '\0';
// targetpath[0] = '\0';
return false;
}
}

42
source/blender/blenkernel/intern/boids.c
View File

@ -230,7 +230,7 @@ static int rule_avoid_collision(BoidRule *rule,
int n, neighbors = 0, nearest = 0;
int ret = 0;
//check deflector objects first
// check deflector objects first
if (acbr->options & BRULE_ACOLL_WITH_DEFLECTORS && bbd->sim->colliders) {
ParticleCollision col;
BVHTreeRayHit hit;
@ -292,7 +292,7 @@ static int rule_avoid_collision(BoidRule *rule,
}
}
//check boids in own system
// check boids in own system
if (acbr->options & BRULE_ACOLL_WITH_BOIDS) {
neighbors = BLI_kdtree_3d_range_search_with_len_squared_cb(bbd->sim->psys->tree,
pa->prev_state.co,
@ -820,11 +820,11 @@ static boid_rule_cb boid_rules[] = {
rule_follow_leader,
rule_average_speed,
rule_fight,
//rule_help,
//rule_protect,
//rule_hide,
//rule_follow_path,
//rule_follow_wall,
// rule_help,
// rule_protect,
// rule_hide,
// rule_follow_path,
// rule_follow_wall,
};
static void set_boid_values(BoidValues *val, BoidSettings *boids, ParticleData *pa)
@ -1069,7 +1069,7 @@ static BoidState *get_boid_state(BoidSettings *boids, ParticleData *pa)
return state;
}
//static int boid_condition_is_true(BoidCondition *cond)
// static int boid_condition_is_true(BoidCondition *cond)
//{
// /* TODO */
// return 0;
@ -1085,7 +1085,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
BoidParticle *bpa = pa->boid;
ParticleSystem *psys = bbd->sim->psys;
int rand;
//BoidCondition *cond;
// BoidCondition *cond;
if (bpa->data.health <= 0.0f) {
pa->alive = PARS_DYING;
@ -1093,9 +1093,9 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
return;
}
//planned for near future
//cond = state->conditions.first;
//for (; cond; cond=cond->next) {
// planned for near future
// cond = state->conditions.first;
// for (; cond; cond=cond->next) {
// if (boid_condition_is_true(cond)) {
// pa->boid->state_id = cond->state_id;
// state = get_boid_state(boids, pa);
@ -1420,7 +1420,7 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
madd_v3_v3fl(pa->state.vel, acc, dtime);
//if (bpa->data.mode != eBoidMode_InAir)
// if (bpa->data.mode != eBoidMode_InAir)
bpa->ground = boid_find_ground(bbd, pa, ground_co, ground_nor);
/* change modes, constrain movement & keep track of down vector */
@ -1506,20 +1506,20 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa)
}
case eBoidMode_Climbing: {
boid_climb(boids, pa, ground_co, ground_nor);
//float nor[3];
//copy_v3_v3(nor, ground_nor);
// float nor[3];
// copy_v3_v3(nor, ground_nor);
///* gather apparent gravity to r_ve */
//madd_v3_v3fl(pa->r_ve, ground_nor, -1.0);
//normalize_v3(pa->r_ve);
// madd_v3_v3fl(pa->r_ve, ground_nor, -1.0);
// normalize_v3(pa->r_ve);
///* raise boid it's size from surface */
//mul_v3_fl(nor, pa->size * boids->height);
//add_v3_v3v3(pa->state.co, ground_co, nor);
// mul_v3_fl(nor, pa->size * boids->height);
// add_v3_v3v3(pa->state.co, ground_co, nor);
///* remove normal component from velocity */
//project_v3_v3v3(v, pa->state.vel, ground_nor);
//sub_v3_v3v3(pa->state.vel, pa->state.vel, v);
// project_v3_v3v3(v, pa->state.vel, ground_nor);
// sub_v3_v3v3(pa->state.vel, pa->state.vel, v);
break;
}
case eBoidMode_OnLand: {

6
source/blender/blenkernel/intern/customdata.c
View File

@ -4464,7 +4464,7 @@ void CustomData_external_remove(CustomData *data, ID *id, int type, int totelem)
{
CustomDataExternal *external = data->external;
CustomDataLayer *layer;
//char filename[FILE_MAX];
// char filename[FILE_MAX];
int layer_index; // i, remove_file;
layer_index = CustomData_get_active_layer_index(data, type);
@ -4526,7 +4526,7 @@ static void copy_bit_flag(void *dst, const void *src, const size_t data_size, co
COPY_BIT_FLAG(uint64_t, dst, src, flag);
break;
default:
//CLOG_ERROR(&LOG, "Unknown flags-container size (%zu)", datasize);
// CLOG_ERROR(&LOG, "Unknown flags-container size (%zu)", datasize);
break;
}
@ -4545,7 +4545,7 @@ static bool check_bit_flag(const void *data, const size_t data_size, const uint6
case 8:
return ((*((uint64_t *)data) & ((uint64_t)flag)) != 0);
default:
//CLOG_ERROR(&LOG, "Unknown flags-container size (%zu)", datasize);
// CLOG_ERROR(&LOG, "Unknown flags-container size (%zu)", datasize);
return false;
}
}

4
source/blender/blenkernel/intern/dynamicpaint.c
View File

@ -2008,7 +2008,7 @@ static Mesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, Object *
MEM_freeN(fcolor);
/* Mark tessellated CD layers as dirty. */
//result->dirty |= DM_DIRTY_TESS_CDLAYERS;
// result->dirty |= DM_DIRTY_TESS_CDLAYERS;
}
/* vertex group paint */
else if (surface->type == MOD_DPAINT_SURFACE_T_WEIGHT) {
@ -2066,7 +2066,7 @@ static Mesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, Object *
}
if (update_normals) {
//result->dirty |= DM_DIRTY_NORMALS;
// result->dirty |= DM_DIRTY_NORMALS;
}
}
/* make a copy of mesh to use as brush data */

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

@ -399,7 +399,7 @@ static void statvis_calc_sharp(BMEditMesh *em,
BMIter iter;
BMesh *bm = em->bm;
BMEdge *e;
//float f_no[3];
// float f_no[3];
const float minmax_irange = 1.0f / (max - min);
int i;

8
source/blender/blenkernel/intern/editmesh_tangent.c
View File

@ -104,7 +104,7 @@ static void emdm_ts_GetPosition(const SMikkTSpaceContext *pContext,
const int face_num,
const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
// assert(vert_index >= 0 && vert_index < 4);
SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData;
const BMLoop **lt;
const BMLoop *l;
@ -138,7 +138,7 @@ static void emdm_ts_GetTextureCoordinate(const SMikkTSpaceContext *pContext,
const int face_num,
const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
// assert(vert_index >= 0 && vert_index < 4);
SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData;
const BMLoop **lt;
const BMLoop *l;
@ -176,7 +176,7 @@ static void emdm_ts_GetNormal(const SMikkTSpaceContext *pContext,
const int face_num,
const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
// assert(vert_index >= 0 && vert_index < 4);
SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData;
const BMLoop **lt;
const BMLoop *l;
@ -221,7 +221,7 @@ static void emdm_ts_SetTSpace(const SMikkTSpaceContext *pContext,
const int face_num,
const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
// assert(vert_index >= 0 && vert_index < 4);
SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData;
const BMLoop **lt;
const BMLoop *l;

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

@ -698,7 +698,7 @@ int get_effector_data(EffectorCache *eff,
ret = psys_get_particle_state(&sim, *efd->index, &state, 0);
/* TODO */
//if (eff->pd->forcefiled == PFIELD_HARMONIC && ret==0) {
// if (eff->pd->forcefiled == PFIELD_HARMONIC && ret==0) {
// if (pa->dietime < eff->psys->cfra)
// eff->flag |= PE_VELOCITY_TO_IMPULSE;
//}

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

@ -894,7 +894,7 @@ static void fcm_python_evaluate(FCurve *UNUSED(fcu),
void *UNUSED(storage))
{
#ifdef WITH_PYTHON
//FMod_Python *data = (FMod_Python *)fcm->data;
// FMod_Python *data = (FMod_Python *)fcm->data;
/* FIXME... need to implement this modifier...
* It will need it execute a script using the custom properties

18
source/blender/blenkernel/intern/ipo.c
View File

@ -511,10 +511,10 @@ static const char *texture_adrcodes_to_paths(int adrcode, int *array_index)
return "turbulence";
case TE_NDEPTH: // XXX texture RNA undefined
//poin= &(tex->noisedepth); *type= IPO_SHORT; break;
// poin= &(tex->noisedepth); *type= IPO_SHORT; break;
break;
case TE_NTYPE: // XXX texture RNA undefined
//poin= &(tex->noisetype); *type= IPO_SHORT; break;
// poin= &(tex->noisetype); *type= IPO_SHORT; break;
break;
case TE_N_BAS1:
@ -686,7 +686,7 @@ static const char *camera_adrcodes_to_paths(int adrcode, int *array_index)
/* result depends on adrcode */
switch (adrcode) {
case CAM_LENS:
#if 0 /* XXX this cannot be resolved easily...
#if 0 /* XXX this cannot be resolved easily... \
* perhaps we assume camera is perspective (works for most cases... */
if (ca->type == CAM_ORTHO)
return "ortho_scale";
@ -1001,7 +1001,7 @@ static char *get_rna_access(ID *id,
/* XXX problematic blocktypes */
case ID_SEQ: /* sequencer strip */
//SEQ_FAC1:
// SEQ_FAC1:
switch (adrcode) {
case SEQ_FAC1:
propname = "effect_fader";
@ -1444,8 +1444,8 @@ static void icu_to_fcurves(ID *id,
else if (icu->bp) {
/* TODO: need to convert from BPoint type to the more compact FPoint type...
* but not priority, since no data used this. */
//BPoint *bp;
//FPoint *fpt;
// BPoint *bp;
// FPoint *fpt;
}
/* add new F-Curve to list */
@ -1506,7 +1506,7 @@ static void icu_to_fcurves(ID *id,
*/
if (((icu->blocktype == ID_OB) && ELEM(icu->adrcode, OB_ROT_X, OB_ROT_Y, OB_ROT_Z)) ||
((icu->blocktype == ID_PO) && ELEM(icu->adrcode, AC_EUL_X, AC_EUL_Y, AC_EUL_Z))) {
const float fac = (float)M_PI / 18.0f; //10.0f * M_PI/180.0f;
const float fac = (float)M_PI / 18.0f; // 10.0f * M_PI/180.0f;
dst->vec[0][1] *= fac;
dst->vec[1][1] *= fac;
@ -1566,8 +1566,8 @@ static void icu_to_fcurves(ID *id,
else if (icu->bp) {
/* TODO: need to convert from BPoint type to the more compact FPoint type...
* but not priority, since no data used this */
//BPoint *bp;
//FPoint *fpt;
// BPoint *bp;
// FPoint *fpt;
}
/* add new F-Curve to list */

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

@ -1228,7 +1228,7 @@ static void mask_calc_point_handle(MaskSplinePoint *point,
{
BezTriple *bezt = &point->bezt;
BezTriple *bezt_prev = NULL, *bezt_next = NULL;
//int handle_type = bezt->h1;
// int handle_type = bezt->h1;
if (point_prev) {
bezt_prev = &point_prev->bezt;

4
source/blender/blenkernel/intern/mask_rasterize.c
View File

@ -1249,7 +1249,7 @@ static float maskrasterize_layer_z_depth_quad(
{
float w[4];
barycentric_weights_v2_quad(v1, v2, v3, v4, pt, w);
//return (v1[2] * w[0]) + (v2[2] * w[1]) + (v3[2] * w[2]) + (v4[2] * w[3]);
// return (v1[2] * w[0]) + (v2[2] * w[1]) + (v3[2] * w[2]) + (v4[2] * w[3]);
return w[2] + w[3]; /* we can make this assumption for small speedup */
}
@ -1287,7 +1287,7 @@ static float maskrasterize_layer_isect(unsigned int *face,
/* needs work */
#if 1
/* quad check fails for bow-tie, so keep using 2 tri checks */
//if (isect_point_quad_v2(xy, cos[face[0]], cos[face[1]], cos[face[2]], cos[face[3]]))
// if (isect_point_quad_v2(xy, cos[face[0]], cos[face[1]], cos[face[2]], cos[face[3]]))
if (isect_point_tri_v2(xy, cos[face[0]], cos[face[1]], cos[face[2]]) ||
isect_point_tri_v2(xy, cos[face[0]], cos[face[2]], cos[face[3]])) {
return maskrasterize_layer_z_depth_quad(

9
source/blender/blenkernel/intern/mball_tessellate.c
View File

@ -1291,7 +1291,14 @@ static void init_meta(Depsgraph *depsgraph, PROCESS *process, Scene *scene, Obje
/* Rotation of MetaElem is stored in quat */
quat_to_mat4(rot, ml->quat);
/* basis object space -> world -> ml object space -> position -> rotation -> ml local space */
/* Matrix multiply is as follows:
* basis object space ->
* world ->
* ml object space ->
* position ->
* rotation ->
* ml local space
*/
mul_m4_series((float(*)[4])new_ml->mat, obinv, bob->obmat, pos, rot);
/* ml local space -> basis object space */
invert_m4_m4((float(*)[4])new_ml->imat, (float(*)[4])new_ml->mat);

4
source/blender/blenkernel/intern/mesh_evaluate.c
View File

@ -1312,11 +1312,11 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli
printf("Invalid clnors in this fan!\n");
}
while ((clnor = BLI_SMALLSTACK_POP(clnors))) {
//print_v2("org clnor", clnor);
// print_v2("org clnor", clnor);
clnor[0] = (short)clnors_avg[0];
clnor[1] = (short)clnors_avg[1];
}
//print_v2("new clnors", clnors_avg);
// print_v2("new clnors", clnors_avg);
}
/* Extra bonus: since smallstack is local to this func,
* no more need to empty it at all cost! */

8
source/blender/blenkernel/intern/mesh_tangent.c
View File

@ -285,7 +285,7 @@ static void dm_ts_GetPosition(const SMikkTSpaceContext *pContext,
const int face_num,
const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
// assert(vert_index >= 0 && vert_index < 4);
SGLSLMeshToTangent *pMesh = pContext->m_pUserData;
const MLoopTri *lt;
uint loop_index;
@ -319,7 +319,7 @@ static void dm_ts_GetTextureCoordinate(const SMikkTSpaceContext *pContext,
const int face_num,
const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
// assert(vert_index >= 0 && vert_index < 4);
SGLSLMeshToTangent *pMesh = pContext->m_pUserData;
const MLoopTri *lt;
uint loop_index;
@ -358,7 +358,7 @@ static void dm_ts_GetNormal(const SMikkTSpaceContext *pContext,
const int face_num,
const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
// assert(vert_index >= 0 && vert_index < 4);
SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *)pContext->m_pUserData;
const MLoopTri *lt;
uint loop_index;
@ -421,7 +421,7 @@ static void dm_ts_SetTSpace(const SMikkTSpaceContext *pContext,
const int face_num,
const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
// assert(vert_index >= 0 && vert_index < 4);
SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *)pContext->m_pUserData;
const MLoopTri *lt;
uint loop_index;

4
source/blender/blenkernel/intern/nla.c
View File

@ -90,7 +90,7 @@ void BKE_nlastrip_free(ListBase *strips, NlaStrip *strip, bool do_id_user)
}
/* free remapping info */
//if (strip->remap)
// if (strip->remap)
// BKE_animremap_free();
/* free own F-Curves */
@ -547,7 +547,7 @@ float nlastrip_get_frame(NlaStrip *strip, float cframe, short mode)
{
switch (strip->type) {
case NLASTRIP_TYPE_META: /* Meta - for now, does the same as transition
* (is really just an empty container). */
* (is really just an empty container). */
case NLASTRIP_TYPE_TRANSITION: /* transition */
return nlastrip_get_frame_transition(strip, cframe, mode);

4
source/blender/blenkernel/intern/node.c
View File

@ -1748,9 +1748,9 @@ void BKE_node_preview_set_pixel(
rgba_float_to_uchar(tar, col);
}
}
//else printf("prv out bound x y %d %d\n", x, y);
// else printf("prv out bound x y %d %d\n", x, y);
}
//else printf("prv out bound x y %d %d\n", x, y);
// else printf("prv out bound x y %d %d\n", x, y);
}
}

4
source/blender/blenkernel/intern/object_deform.c
View File

@ -578,7 +578,7 @@ bool *BKE_object_defgroup_lock_flags_get(Object *ob, const int defbase_tot)
{
bool is_locked = false;
int i;
//int defbase_tot = BLI_listbase_count(&ob->defbase);
// int defbase_tot = BLI_listbase_count(&ob->defbase);
bool *lock_flags = MEM_mallocN(defbase_tot * sizeof(bool), "defflags");
bDeformGroup *defgroup;
@ -602,7 +602,7 @@ bool *BKE_object_defgroup_validmap_get(Object *ob, const int defbase_tot)
bool *defgroup_validmap;
GHash *gh;
int i, step1 = 1;
//int defbase_tot = BLI_listbase_count(&ob->defbase);
// int defbase_tot = BLI_listbase_count(&ob->defbase);
VirtualModifierData virtualModifierData;
if (BLI_listbase_is_empty(&ob->defbase)) {

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

@ -1377,7 +1377,7 @@ void BKE_ocean_bake(struct Ocean *o,
int res_x = och->resolution_x;
int res_y = och->resolution_y;
char string[FILE_MAX];
//RNG *rng;
// RNG *rng;
if (!o) {
return;
@ -1390,7 +1390,7 @@ void BKE_ocean_bake(struct Ocean *o,
prev_foam = NULL;
}
//rng = BLI_rng_new(0);
// rng = BLI_rng_new(0);
/* setup image format */
imf.imtype = R_IMF_IMTYPE_OPENEXR;
@ -1497,12 +1497,12 @@ void BKE_ocean_bake(struct Ocean *o,
if (prev_foam) {
MEM_freeN(prev_foam);
}
//BLI_rng_free(rng);
// BLI_rng_free(rng);
return;
}
}
//BLI_rng_free(rng);
// BLI_rng_free(rng);
if (prev_foam) {
MEM_freeN(prev_foam);
}

8
source/blender/blenkernel/intern/packedFile.c
View File

@ -181,7 +181,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char
return NULL;
}
//XXX waitcursor(1);
// XXX waitcursor(1);
/* convert relative filenames to absolute filenames */
@ -216,7 +216,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char
close(file);
}
//XXX waitcursor(0);
// XXX waitcursor(0);
return (pf);
}
@ -281,7 +281,7 @@ int writePackedFile(ReportList *reports,
/* void *data; */
if (guimode) {
} //XXX waitcursor(1);
} // XXX waitcursor(1);
BLI_strncpy(name, filename, sizeof(name));
BLI_path_abs(name, ref_file_name);
@ -336,7 +336,7 @@ int writePackedFile(ReportList *reports,
}
if (guimode) {
} //XXX waitcursor(0);
} // XXX waitcursor(0);
return (ret_value);
}

14
source/blender/blenkernel/intern/particle.c
View File

@ -1546,7 +1546,7 @@ int psys_particle_dm_face_lookup(Mesh *mesh_final,
if (osface_final == NULL) {
/* Assume we don't need osface_final data, and we get a direct 1-1 mapping... */
if (findex_orig < totface_final) {
//printf("\tNO CD_ORIGSPACE, assuming not needed\n");
// printf("\tNO CD_ORIGSPACE, assuming not needed\n");
return findex_orig;
}
else {
@ -2099,7 +2099,7 @@ int do_guides(Depsgraph *depsgraph,
add_v3_v3(vec_to_point, guidevec);
//sub_v3_v3v3(pa_loc, pa_loc, pa_zero);
// sub_v3_v3v3(pa_loc, pa_loc, pa_zero);
madd_v3_v3fl(effect, vec_to_point, data->strength);
madd_v3_v3fl(veffect, guidedir, data->strength);
totstrength += data->strength;
@ -2115,7 +2115,7 @@ int do_guides(Depsgraph *depsgraph,
mul_v3_fl(effect, 1.0f / totstrength);
}
CLAMP(totstrength, 0.0f, 1.0f);
//add_v3_v3(effect, pa_zero);
// add_v3_v3(effect, pa_zero);
interp_v3_v3v3(state->co, state->co, effect, totstrength);
normalize_v3(veffect);
@ -4338,7 +4338,7 @@ void psys_get_particle_on_path(ParticleSimulationData *sim,
}
}
else if (totchild) {
//invert_m4_m4(imat, ob->obmat);
// invert_m4_m4(imat, ob->obmat);
/* interpolate childcache directly if it exists */
if (psys->childcache) {
@ -4384,9 +4384,9 @@ void psys_get_particle_on_path(ParticleSimulationData *sim,
/* We need to save the actual root position of the child for
* positioning it accurately to the surface of the emitter. */
//copy_v3_v3(cpa_1st, co);
// copy_v3_v3(cpa_1st, co);
//mul_m4_v3(ob->obmat, cpa_1st);
// mul_m4_v3(ob->obmat, cpa_1st);
pa = psys->particles + cpa->parent;
@ -4470,7 +4470,7 @@ void psys_get_particle_on_path(ParticleSimulationData *sim,
w++;
}
/* apply offset for correct positioning */
//add_v3_v3(state->co, cpa_1st);
// add_v3_v3(state->co, cpa_1st);
}
else {
/* offset the child from the parent position */

10
source/blender/blenkernel/intern/particle_system.c
View File

@ -567,7 +567,7 @@ void psys_thread_context_free(ParticleThreadContext *ctx)
if (ctx->seams) {
MEM_freeN(ctx->seams);
}
//if (ctx->vertpart) MEM_freeN(ctx->vertpart);
// if (ctx->vertpart) MEM_freeN(ctx->vertpart);
BLI_kdtree_3d_free(ctx->tree);
if (ctx->clumpcurve != NULL) {
@ -619,7 +619,7 @@ void initialize_particle(ParticleSimulationData *sim, ParticleData *pa)
pa->hair_index = 0;
/* we can't reset to -1 anymore since we've figured out correct index in distribute_particles */
/* usage other than straight after distribute has to handle this index by itself - jahka*/
//pa->num_dmcache = DMCACHE_NOTFOUND; /* assume we don't have a derived mesh face */
// pa->num_dmcache = DMCACHE_NOTFOUND; /* assume we don't have a derived mesh face */
}
static void initialize_all_particles(ParticleSimulationData *sim)
@ -2208,7 +2208,7 @@ static void sph_integrate(ParticleSimulationData *sim,
sphdata->pa = pa;
sphdata->mass = pa_mass;
sphdata->pass = 0;
//sphdata.element_size and sphdata.flow are set in the callback.
// sphdata.element_size and sphdata.flow are set in the callback.
/* restore previous state and treat gravity & effectors as external acceleration*/
sub_v3_v3v3(effector_acceleration, pa->state.vel, pa->prev_state.vel);
@ -2300,7 +2300,7 @@ static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, floa
mul_v3_fl(pa->state.vel, 1.f - part->dampfac * efdata.ptex.damp * 25.f * dtime);
}
//copy_v3_v3(pa->state.ave, states->ave);
// copy_v3_v3(pa->state.ave, states->ave);
/* finally we do guides */
time = (cfra - pa->time) / pa->lifetime;
@ -4201,7 +4201,7 @@ static void particles_fluid_step(ParticleSimulationData *sim,
float wrf;
gzread(gzf, &wrf, sizeof(wrf));
pa->state.co[j] = wrf;
//fprintf(stderr,"Rj%d ",j);
// fprintf(stderr,"Rj%d ",j);
}
for (j = 0; j < 3; j++) {
float wrf;

4
source/blender/blenkernel/intern/pbvh.c
View File

@ -154,12 +154,12 @@ static void update_node_vb(PBVH *bvh, PBVHNode *node)
node->vb = vb;
}
//void BKE_pbvh_node_BB_reset(PBVHNode *node)
// void BKE_pbvh_node_BB_reset(PBVHNode *node)
//{
// BB_reset(&node->vb);
//}
//
//void BKE_pbvh_node_BB_expand(PBVHNode *node, float co[3])
// void BKE_pbvh_node_BB_expand(PBVHNode *node, float co[3])
//{
// BB_expand(&node->vb, co);
//}

6
source/blender/blenkernel/intern/pointcache.c
View File

@ -631,7 +631,7 @@ static int ptcache_smoke_write(PTCacheFile *pf, void *smoke_v)
unsigned int in_len = sizeof(float) * (unsigned int)res;
unsigned char *out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len) * 4,
"pointcache_lzo_buffer");
//int mode = res >= 1000000 ? 2 : 1;
// int mode = res >= 1000000 ? 2 : 1;
int mode = 1; // light
if (sds->cache_comp == SM_CACHE_HEAVY) {
mode = 2; // heavy
@ -704,7 +704,7 @@ static int ptcache_smoke_write(PTCacheFile *pf, void *smoke_v)
smoke_turbulence_get_res(sds->wt, res_big_array);
res_big = res_big_array[0] * res_big_array[1] * res_big_array[2];
//mode = res_big >= 1000000 ? 2 : 1;
// mode = res_big >= 1000000 ? 2 : 1;
mode = 1; // light
if (sds->cache_high_comp == SM_CACHE_HEAVY) {
mode = 2; // heavy
@ -2286,7 +2286,7 @@ static int ptcache_file_compressed_write(
r = LzmaCompress(out,
&out_len,
in,
in_len, //assume sizeof(char)==1....
in_len, // assume sizeof(char)==1....
props,
&sizeOfIt,
5,

4
source/blender/blenkernel/intern/seqcache.c
View File

@ -617,8 +617,8 @@ void BKE_sequencer_cache_put(
}
/* Set last_key's reference to this key so we can look up chain backwards
* Item is already put in cache, so cache->last_key points to current key;
*/
* Item is already put in cache, so cache->last_key points to current key;
*/
if (flag & type && temp_last_key) {
temp_last_key->link_next = cache->last_key;
}

6
source/blender/blenkernel/intern/sequencer.c
View File

@ -2347,7 +2347,7 @@ static void color_balance_byte_byte(StripColorBalance *cb_,
int height,
float mul)
{
//unsigned char cb_tab[3][256];
// unsigned char cb_tab[3][256];
unsigned char *cp = rect;
unsigned char *e = cp + width * 4 * height;
unsigned char *m = mask_rect;
@ -4134,8 +4134,8 @@ static pthread_mutex_t queue_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t wakeup_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t wakeup_cond = PTHREAD_COND_INITIALIZER;
//static pthread_mutex_t prefetch_ready_lock = PTHREAD_MUTEX_INITIALIZER;
//static pthread_cond_t prefetch_ready_cond = PTHREAD_COND_INITIALIZER;
// static pthread_mutex_t prefetch_ready_lock = PTHREAD_MUTEX_INITIALIZER;
// static pthread_cond_t prefetch_ready_cond = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t frame_done_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t frame_done_cond = PTHREAD_COND_INITIALIZER;

18
source/blender/blenkernel/intern/shrinkwrap.c
View File

@ -69,25 +69,25 @@
#define OUT_OF_MEMORY() ((void)printf("Shrinkwrap: Out of memory\n"))
typedef struct ShrinkwrapCalcData {
ShrinkwrapModifierData *smd; //shrinkwrap modifier data
ShrinkwrapModifierData *smd; // shrinkwrap modifier data
struct Object *ob; //object we are applying shrinkwrap to
struct Object *ob; // object we are applying shrinkwrap to
struct MVert *vert; //Array of verts being projected (to fetch normals or other data)
float (*vertexCos)[3]; //vertexs being shrinkwraped
struct MVert *vert; // Array of verts being projected (to fetch normals or other data)
float (*vertexCos)[3]; // vertexs being shrinkwraped
int numVerts;
struct MDeformVert *dvert; //Pointer to mdeform array
int vgroup; //Vertex group num
struct MDeformVert *dvert; // Pointer to mdeform array
int vgroup; // Vertex group num
bool invert_vgroup; /* invert vertex group influence */
struct Mesh *target; //mesh we are shrinking to
struct SpaceTransform local2target; //transform to move between local and target space
struct Mesh *target; // mesh we are shrinking to
struct SpaceTransform local2target; // transform to move between local and target space
struct ShrinkwrapTreeData *tree; // mesh BVH tree data
struct Object *aux_target;
float keepDist; //Distance to keep above target surface (units are in local space)
float keepDist; // Distance to keep above target surface (units are in local space)
} ShrinkwrapCalcData;
typedef struct ShrinkwrapCalcCBData {

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

@ -2676,7 +2676,7 @@ static void update_flowsfluids(
float *velocity_x = smoke_get_velocity_x(sds->fluid);
float *velocity_y = smoke_get_velocity_y(sds->fluid);
float *velocity_z = smoke_get_velocity_z(sds->fluid);
//unsigned char *obstacle = smoke_get_obstacle(sds->fluid);
// unsigned char *obstacle = smoke_get_obstacle(sds->fluid);
// DG TODO UNUSED unsigned char *obstacleAnim = smoke_get_obstacle_anim(sds->fluid);
int bigres[3];
float *velocity_map = em->velocity;

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

@ -599,7 +599,7 @@ static void add_mesh_quad_diag_springs(Object *ob)
if (ob->soft) {
int nofquads;
//float s_shear = ob->soft->shearstiff*ob->soft->shearstiff;
// float s_shear = ob->soft->shearstiff*ob->soft->shearstiff;
nofquads = count_mesh_quads(me);
if (nofquads) {
@ -1459,7 +1459,7 @@ static void _scan_for_ext_spring_forces(
sb->bpoint[bs->v1].pos, sb->bpoint[bs->v2].pos, &damp, feedback, ob, timenow)) {
add_v3_v3(bs->ext_force, feedback);
bs->flag |= BSF_INTERSECT;
//bs->cf=damp;
// bs->cf=damp;
bs->cf = sb->choke * 0.01f;
}
}
@ -2466,7 +2466,7 @@ static void softbody_apply_forces(Object *ob, float forcetime, int mode, float *
else {
*err = maxerrpos;
}
//printf("EP %f EV %f\n", maxerrpos, maxerrvel);
// printf("EP %f EV %f\n", maxerrpos, maxerrvel);
if (fuzzy) {
*err /= sb->fuzzyness;
}
@ -3183,7 +3183,7 @@ void sbFreeSimulation(SoftBody *sb)
/* makes totally fresh start situation */
void sbObjectToSoftbody(Object *ob)
{
//ob->softflag |= OB_SB_REDO;
// ob->softflag |= OB_SB_REDO;
free_softbody_intern(ob->soft);
}
@ -3272,7 +3272,7 @@ void SB_estimate_transform(Object *ob, float lloc[3], float lrot[3][3], float ls
}
vcloud_estimate_transform_v3(sb->totpoint, opos, NULL, rpos, NULL, com, rcom, lrot, lscale);
//sub_v3_v3(com, rcom);
// sub_v3_v3(com, rcom);
if (lloc) {
copy_v3_v3(lloc, com);
}
@ -3421,7 +3421,7 @@ static void softbody_step(
if (forcetime > forcetimemin) {
forcetime = max_ff(forcetime / 2.0f, forcetimemin);
softbody_restore_prev_step(ob);
//printf("down, ");
// printf("down, ");
}
else {
timedone += forcetime;
@ -3432,7 +3432,7 @@ static void softbody_step(
if (sb->scratch->flag & SBF_DOFUZZY) {
///* stay with this stepsize unless err really small */
//if (err > SoftHeunTol/(2.0f*sb->fuzzyness)) {
// if (err > SoftHeunTol/(2.0f*sb->fuzzyness)) {
newtime = forcetime;
//}
}
@ -3443,7 +3443,7 @@ static void softbody_step(
}
timedone += forcetime;
newtime = min_ff(forcetimemax, max_ff(newtime, forcetimemin));
//if (newtime > forcetime) printf("up, ");
// if (newtime > forcetime) printf("up, ");
if (forcetime > 0.0f) {
forcetime = min_ff(dtime - timedone, newtime);
}
@ -3476,14 +3476,14 @@ static void softbody_step(
}
else if (sb->solver_ID == 2) {
/* do semi "fake" implicit euler */
//removed
// removed
} /*SOLVER SELECT*/
else if (sb->solver_ID == 4) {
/* do semi "fake" implicit euler */
} /*SOLVER SELECT*/
else if (sb->solver_ID == 3) {
/* do "stupid" semi "fake" implicit euler */
//removed
// removed
} /*SOLVER SELECT*/
else {

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

@ -692,7 +692,8 @@ static float studiolight_spherical_harmonics_geomerics_eval(
const float normal[3], float sh0, float sh1, float sh2, float sh3)
{
/* Use Geomerics non-linear SH. */
/* http://www.geomerics.com/wp-content/uploads/2015/08/CEDEC_Geomerics_ReconstructingDiffuseLighting1.pdf */
/* http://www.geomerics.com/wp-content/uploads/2015/08/CEDEC_Geomerics_ReconstructingDiffuseLighting1.pdf
*/
float R0 = sh0 * M_1_PI;
float R1[3] = {-sh3, sh2, -sh1};

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

@ -746,7 +746,7 @@ static void ss_sync_ccg_from_derivedmesh(CCGSubSurf *ss,
static int hasGivenError = 0;
if (!hasGivenError) {
//XXX error("Unrecoverable error in SubSurf calculation,"
// XXX error("Unrecoverable error in SubSurf calculation,"
// " mesh is inconsistent.");
hasGivenError = 1;

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

@ -39,7 +39,7 @@
static Text *activeToolText = NULL;
static SuggList suggestions = {NULL, NULL, NULL, NULL, NULL};
static char *documentation = NULL;
//static int doc_lines = 0;
// static int doc_lines = 0;
static void txttl_free_suggest(void)
{

6
source/blender/blenkernel/intern/text.c
View File

@ -2448,7 +2448,7 @@ void txt_do_undo(Text *text, TextUndoBuf *utxt)
break;
}
default:
//XXX error("Undo buffer error - resetting");
// XXX error("Undo buffer error - resetting");
utxt->pos = -1;
break;
@ -2640,7 +2640,7 @@ void txt_do_redo(Text *text, TextUndoBuf *utxt)
break;
}
default:
//XXX error("Undo buffer error - resetting");
// XXX error("Undo buffer error - resetting");
utxt->pos = -1;
break;
@ -3268,7 +3268,7 @@ int txt_setcurr_tab_spaces(Text *text, int space)
}
while (text->curl->line[i] == indent) {
//we only count those tabs/spaces that are before any text or before the curs;
// we only count those tabs/spaces that are before any text or before the curs;
if (i == text->curc) {
return i;
}

19
source/blender/blenkernel/intern/unit.c
View File

@ -426,8 +426,8 @@ static size_t unit_as_string(char *str,
value_conv = value / unit->scalar;
/* Adjust precision to expected number of significant digits.
* Note that here, we shall not have to worry about very big/small numbers, units are expected to replace
* 'scientific notation' in those cases. */
* Note that here, we shall not have to worry about very big/small numbers, units are expected to
* replace 'scientific notation' in those cases. */
prec -= integer_digits_d(value_conv);
CLAMP(prec, 0, 6);
@ -803,7 +803,8 @@ static const bUnitDef *unit_detect_from_str(const bUnitCollection *usys,
{
/* Try to find a default unit from current or previous string.
* This allows us to handle cases like 2 + 2mm, people would expect to get 4mm, not 2.002m!
* Note this does not handle corner cases like 2 + 2cm + 1 + 2.5mm... We can't support everything. */
* Note this does not handle corner cases like 2 + 2cm + 1 + 2.5mm... We can't support
* everything. */
const bUnitDef *unit = NULL;
/* see which units the new value has */
@ -889,10 +890,12 @@ bool bUnit_ReplaceString(
/* Try to find a default unit from current or previous string. */
default_unit = unit_detect_from_str(usys, str, str_prev);
/* We apply the default unit to the whole expression (default unit is now the reference '1.0' one). */
/* We apply the default unit to the whole expression (default unit is now the reference '1.0'
* one). */
scale_pref_base *= default_unit->scalar;
/* Apply the default unit on the whole expression, this allows to handle nasty cases like '2+2in'. */
/* Apply the default unit on the whole expression, this allows to handle nasty cases like
* '2+2in'. */
if (BLI_snprintf(str_tmp, sizeof(str_tmp), "(%s)*%.9g", str, default_unit->scalar) <
sizeof(str_tmp)) {
strncpy(str, str_tmp, len_max);
@ -913,9 +916,9 @@ bool bUnit_ReplaceString(
{
/* try other unit systems now, so we can evaluate imperial when metric is set for eg. */
/* Note that checking other systems at that point means we do not support their units as 'default' one.
* In other words, when in metrics, typing '2+2in' will give 2 meters 2 inches, not 4 inches.
* I do think this is the desired behavior!
/* Note that checking other systems at that point means we do not support their units as
* 'default' one. In other words, when in metrics, typing '2+2in' will give 2 meters 2 inches,
* not 4 inches. I do think this is the desired behavior!
*/
const bUnitCollection *usys_iter;
int system_iter;

7
source/blender/blenkernel/intern/writeffmpeg.c
View File

@ -637,7 +637,7 @@ static AVStream *alloc_video_stream(FFMpegContext *context,
}
/* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */
//c->me_method = ME_EPZS;
// c->me_method = ME_EPZS;
codec = avcodec_find_encoder(c->codec_id);
if (!codec) {
@ -787,7 +787,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context,
codec = avcodec_find_encoder(c->codec_id);
if (!codec) {
//XXX error("Couldn't find a valid audio codec");
// XXX error("Couldn't find a valid audio codec");
return NULL;
}
@ -831,7 +831,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context,
set_ffmpeg_properties(rd, c, "audio", &opts);
if (avcodec_open2(c, codec, &opts) < 0) {
//XXX error("Couldn't initialize audio codec");
// XXX error("Couldn't initialize audio codec");
BLI_strncpy(error, IMB_ffmpeg_last_error(), error_size);
av_dict_free(&opts);
return NULL;
@ -1523,7 +1523,6 @@ static IDProperty *BKE_ffmpeg_property_add(RenderData *rd,
(char
*)" ";
val.string.len = 80;
/* val.str = (char *)" ";*/
idp_type = IDP_STRING;
break;
case AV_OPT_TYPE_CONST:

4
source/blender/blenlib/BLI_listbase.h
View File

@ -27,8 +27,8 @@
#include "BLI_compiler_attrs.h"
#include "BLI_utildefines.h"
#include "DNA_listBase.h"
//struct ListBase;
//struct LinkData;
// struct ListBase;
// struct LinkData;
#ifdef __cplusplus
extern "C" {

2
source/blender/blenlib/BLI_rect.h
View File

@ -66,7 +66,7 @@ void BLI_rctf_interp(struct rctf *rect,
const struct rctf *rect_a,
const struct rctf *rect_b,
const float fac);
//void BLI_rcti_interp(struct rctf *rect, struct rctf *rect_a, struct rctf *rect_b, float fac);
// void BLI_rcti_interp(struct rctf *rect, struct rctf *rect_a, struct rctf *rect_b, float fac);
bool BLI_rctf_clamp_pt_v(const struct rctf *rect, float xy[2]);
bool BLI_rcti_clamp_pt_v(const struct rcti *rect, int xy[2]);
bool BLI_rctf_clamp(struct rctf *rect, const struct rctf *rect_bounds, float r_xy[2]);

2
source/blender/blenlib/intern/DLRB_tree.c
View File

@ -515,7 +515,7 @@ static void insert_check_3(DLRBT_Tree *tree, DLRBT_Node *node)
if ((node == node->parent->left) && (node->parent == gp->left)) {
rotate_right(tree, gp);
}
else { //if ((node == node->parent->right) && (node->parent == gp->right))
else { // if ((node == node->parent->right) && (node->parent == gp->right))
rotate_left(tree, gp);
}
}

4
source/blender/blenlib/intern/freetypefont.c
View File

@ -386,7 +386,7 @@ static int check_freetypefont(PackedFile *pf)
err = FT_New_Memory_Face(library, pf->data, pf->size, 0, &face);
if (err) {
success = 0;
//XXX error("This is not a valid font");
// XXX error("This is not a valid font");
}
else {
glyph_index = FT_Get_Char_Index(face, 'A');
@ -400,7 +400,7 @@ static int check_freetypefont(PackedFile *pf)
success = 1;
}
else {
//XXX error("Selected Font has no outline data");
// XXX error("Selected Font has no outline data");
success = 0;
}
}

2
source/blender/blenlib/intern/math_geom.c
View File

@ -2856,7 +2856,7 @@ bool isect_ray_aabb_v3(const struct IsectRayAABB_Precalc *data,
/* Note: tmax does not need to be updated since we don't use it
* keeping this here for future reference - jwilkins */
//if (tzmax < tmax) tmax = tzmax;
// if (tzmax < tmax) tmax = tzmax;
if (tmin_out) {
(*tmin_out) = tmin;

4
source/blender/blenlib/intern/noise.c
View File

@ -27,8 +27,8 @@
/* local */
static float noise3_perlin(float vec[3]);
//static float turbulence_perlin(const float point[3], float lofreq, float hifreq);
//static float turbulencep(float noisesize, float x, float y, float z, int nr);
// static float turbulence_perlin(const float point[3], float lofreq, float hifreq);
// static float turbulencep(float noisesize, float x, float y, float z, int nr);
/* UNUSED */
// #define HASHVEC(x, y, z) hashvectf + 3 * hash[(hash[(hash[(z) & 255] + (y)) & 255] + (x)) & 255]

2
source/blender/blenloader/intern/readfile.c
View File

@ -7362,7 +7362,7 @@ static void direct_link_area(FileData *fd, ScrArea *area)
link_list(fd, &sconsole->scrollback);
link_list(fd, &sconsole->history);
//for (cl= sconsole->scrollback.first; cl; cl= cl->next)
// for (cl= sconsole->scrollback.first; cl; cl= cl->next)
// cl->line= newdataadr(fd, cl->line);
/* comma expressions, (e.g. expr1, expr2, expr3) evaluate each expression,

26
source/blender/blenloader/intern/versioning_250.c
View File

@ -277,7 +277,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
ar->v2d.keepzoom |= (V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y | V2D_KEEPASPECT);
ar->v2d.keeptot = V2D_KEEPTOT_STRICT;
ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f;
//ar->v2d.flag |= V2D_IS_INITIALISED;
// ar->v2d.flag |= V2D_IS_INITIALISED;
break;
}
case SPACE_GRAPH: {
@ -294,7 +294,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
ar->v2d.max[0] = MAXFRAMEF;
ar->v2d.max[1] = FLT_MAX;
//ar->v2d.flag |= V2D_IS_INITIALISED;
// ar->v2d.flag |= V2D_IS_INITIALISED;
break;
}
case SPACE_NLA: {
@ -386,7 +386,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
SpaceText *st = (SpaceText *)sl;
st->flags |= ST_FIND_WRAP;
}
//case SPACE_XXX: // FIXME... add other ones
// case SPACE_XXX: // FIXME... add other ones
// memcpy(&ar->v2d, &((SpaceXxx *)sl)->v2d, sizeof(View2D));
// break;
}
@ -645,8 +645,8 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
Tex *tx;
ParticleSettings *part;
Object *ob;
//PTCacheID *pid;
//ListBase pidlist;
// PTCacheID *pid;
// ListBase pidlist;
bSound *sound;
Sequence *seq;
@ -756,12 +756,12 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
/* set old pointcaches to have disk cache flag */
for (ob = bmain->objects.first; ob; ob = ob->id.next) {
//BKE_ptcache_ids_from_object(&pidlist, ob);
// BKE_ptcache_ids_from_object(&pidlist, ob);
//for (pid = pidlist.first; pid; pid = pid->next)
// for (pid = pidlist.first; pid; pid = pid->next)
// pid->cache->flag |= PTCACHE_DISK_CACHE;
//BLI_freelistN(&pidlist);
// BLI_freelistN(&pidlist);
}
/* type was a mixed flag & enum. move the 2d flag elsewhere */
@ -780,18 +780,18 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
Tex *tex;
Scene *sce;
ToolSettings *ts;
//PTCacheID *pid;
//ListBase pidlist;
// PTCacheID *pid;
// ListBase pidlist;
for (ob = bmain->objects.first; ob; ob = ob->id.next) {
//BKE_ptcache_ids_from_object(&pidlist, ob);
// BKE_ptcache_ids_from_object(&pidlist, ob);
//for (pid = pidlist.first; pid; pid = pid->next) {
// for (pid = pidlist.first; pid; pid = pid->next) {
// if (BLI_listbase_is_empty(pid->ptcaches))
// pid->ptcaches->first = pid->ptcaches->last = pid->cache;
//}
//BLI_freelistN(&pidlist);
// BLI_freelistN(&pidlist);
if (ob->type == OB_MESH) {
Mesh *me = blo_do_versions_newlibadr(fd, lib, ob->data);

2
source/blender/blenloader/intern/versioning_260.c
View File

@ -1997,7 +1997,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (bmain->versionfile < 267) {
//if (!DNA_struct_elem_find(fd->filesdna, "Brush", "int", "stencil_pos")) {
// if (!DNA_struct_elem_find(fd->filesdna, "Brush", "int", "stencil_pos")) {
Brush *brush;
for (brush = bmain->brushes.first; brush; brush = brush->id.next) {

12
source/blender/blenloader/intern/versioning_legacy.c
View File

@ -1042,33 +1042,33 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
if (sbuts->mainb == BUTS_LAMP) {
sbuts->mainb = CONTEXT_SHADING;
//sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_LAMP;
// sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_LAMP;
}
else if (sbuts->mainb == BUTS_MAT) {
sbuts->mainb = CONTEXT_SHADING;
//sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_MAT;
// sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_MAT;
}
else if (sbuts->mainb == BUTS_TEX) {
sbuts->mainb = CONTEXT_SHADING;
//sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_TEX;
// sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_TEX;
}
else if (sbuts->mainb == BUTS_ANIM) {
sbuts->mainb = CONTEXT_OBJECT;
}
else if (sbuts->mainb == BUTS_WORLD) {
sbuts->mainb = CONTEXT_SCENE;
//sbuts->tab[CONTEXT_SCENE] = TAB_SCENE_WORLD;
// sbuts->tab[CONTEXT_SCENE] = TAB_SCENE_WORLD;
}
else if (sbuts->mainb == BUTS_RENDER) {
sbuts->mainb = CONTEXT_SCENE;
//sbuts->tab[CONTEXT_SCENE] = TAB_SCENE_RENDER;
// sbuts->tab[CONTEXT_SCENE] = TAB_SCENE_RENDER;
}
else if (sbuts->mainb == BUTS_FPAINT) {
sbuts->mainb = CONTEXT_EDITING;
}
else if (sbuts->mainb == BUTS_RADIO) {
sbuts->mainb = CONTEXT_SHADING;
//sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_RAD;
// sbuts->tab[CONTEXT_SHADING] = TAB_SHADING_RAD;
}
else if (sbuts->mainb == BUTS_CONSTRAINT) {
sbuts->mainb = CONTEXT_OBJECT;

4
source/blender/bmesh/intern/bmesh_core.c
View File

@ -1575,7 +1575,7 @@ BMFace *bmesh_kernel_split_face_make_edge(BMesh *bm,
}
else {
/* this code is not significant until holes actually work */
//printf("warning: call to split face euler without holes argument; holes will be tossed.\n");
// printf("warning: call to split face euler without holes argument; holes will be tossed.\n");
for (lst = f->loops.last; lst != f->loops.first; lst = lst2) {
lst2 = lst->prev;
BLI_mempool_free(bm->looplistpool, lst);
@ -1717,7 +1717,7 @@ BMVert *bmesh_kernel_split_edge_make_vert(BMesh *bm, BMVert *tv, BMEdge *e, BMEd
/* verify loop->v and loop->next->v pointers for e */
for (i = 0, l = e->l; i < radlen; i++, l = l->radial_next) {
BMESH_ASSERT(l->e == e);
//BMESH_ASSERT(l->radial_next == l);
// BMESH_ASSERT(l->radial_next == l);
BMESH_ASSERT(!(l->prev->e != e_new && l->next->e != e_new));
edok = BM_verts_in_edge(l->v, l->next->v, e);

4
source/blender/bmesh/intern/bmesh_log.c
View File

@ -730,8 +730,8 @@ void BM_log_entry_drop(BMLogEntry *entry)
* Also, design wise, a first entry should not have any deleted vertices since it
* should not have anything to delete them -from-
*/
//bm_log_id_ghash_release(log, entry->deleted_faces);
//bm_log_id_ghash_release(log, entry->deleted_verts);
// bm_log_id_ghash_release(log, entry->deleted_faces);
// bm_log_id_ghash_release(log, entry->deleted_verts);
}
else if (!entry->next) {
/* Release IDs of elements that are added by this entry. Since

4
source/blender/bmesh/intern/bmesh_mesh.c
View File

@ -954,11 +954,11 @@ static void bm_mesh_loops_calc_normals(BMesh *bm,
/* printf("Invalid clnors in this fan!\n"); */
while ((clnor = BLI_SMALLSTACK_POP(clnors))) {
//print_v2("org clnor", clnor);
// print_v2("org clnor", clnor);
clnor[0] = (short)clnors_avg[0];
clnor[1] = (short)clnors_avg[1];
}
//print_v2("new clnors", clnors_avg);
// print_v2("new clnors", clnors_avg);
}
else {
/* We still have to consume the stack! */

2
source/blender/bmesh/intern/bmesh_operator_api.h
View File

@ -628,7 +628,7 @@ void BMO_slot_buffer_from_all(BMesh *bm,
* don't directly access. */
typedef struct BMOIter {
BMOpSlot *slot;
int cur; //for arrays
int cur; // for arrays
GHashIterator giter;
void **val;
char restrictmask; /* bitwise '&' with BMHeader.htype */

2
source/blender/bmesh/intern/bmesh_operators.c
View File

@ -272,7 +272,7 @@ BMOpSlot *BMO_slot_get(BMOpSlot slot_args[BMO_OP_MAX_SLOTS], const char *identif
int slot_code = bmo_name_to_slotcode_check(slot_args, identifier);
if (UNLIKELY(slot_code < 0)) {
//return &BMOpEmptySlot;
// return &BMOpEmptySlot;
BLI_assert(0);
return NULL; /* better crash */
}

4
source/blender/bmesh/intern/bmesh_polygon.c
View File

@ -1069,10 +1069,10 @@ void BM_face_triangulate(BMesh *bm,
/* named confusingly, l_v1 is in fact the second vertex */
if (split_24) {
l_v1 = l_v4;
//l_v2 = l_v2;
// l_v2 = l_v2;
}
else {
//l_v1 = l_v1;
// l_v1 = l_v1;
l_v2 = l_v3;
}
break;

4
source/blender/bmesh/intern/bmesh_walkers_impl.c
View File

@ -726,9 +726,9 @@ static void *bmw_IslandboundWalker_step(BMWalker *walker)
iwalk = BMW_state_add(walker);
iwalk->base = owalk.base;
//if (!BMO_face_flag_test(walker->bm, l->f, walker->restrictflag))
// if (!BMO_face_flag_test(walker->bm, l->f, walker->restrictflag))
// iwalk->curloop = l->radial_next;
iwalk->curloop = l; //else iwalk->curloop = l;
iwalk->curloop = l; // else iwalk->curloop = l;
iwalk->lastv = v;
return owalk.curloop;

2
source/blender/bmesh/operators/bmo_fill_grid.c
View File

@ -485,7 +485,7 @@ static void bm_grid_fill(BMesh *bm,
const uint xtot = (uint)BM_edgeloop_length_get(estore_a);
const uint ytot = (uint)BM_edgeloop_length_get(estore_rail_a);
//BMVert *v;
// BMVert *v;
uint i;
#ifdef DEBUG
uint x, y;

2
source/blender/bmesh/operators/bmo_removedoubles.c
View File

@ -429,7 +429,7 @@ void bmo_pointmerge_exec(BMesh *bm, BMOperator *op)
BMO_slot_vec_get(op->slots_in, "merge_co", vec);
//BMO_op_callf(bm, op->flag, "collapse_uvs edges=%s", op, "edges");
// BMO_op_callf(bm, op->flag, "collapse_uvs edges=%s", op, "edges");
BMO_op_init(bm, &weldop, op->flag, "weld_verts");
slot_targetmap = BMO_slot_get(weldop.slots_in, "targetmap");

4
source/blender/bmesh/operators/bmo_subdivide.c
View File

@ -40,7 +40,7 @@ typedef struct SubDParams {
int smooth_falloff;
float fractal;
float along_normal;
//int beauty;
// int beauty;
bool use_smooth;
bool use_smooth_even;
bool use_sphere;
@ -391,7 +391,7 @@ static BMVert *bm_subdivide_edge_addvert(BMesh *bm,
/* offset for smooth or sphere or fractal */
alter_co(v_new, e_orig, params, factor_subd, v_a, v_b);
#if 0 //BMESH_TODO
#if 0 // BMESH_TODO
/* clip if needed by mirror modifier */
if (edge->v1->f2) {
if (edge->v1->f2 & edge->v2->f2 & 1) {

2
source/blender/bmesh/tools/bmesh_bevel.c
View File

@ -1855,7 +1855,7 @@ static void bevel_extend_edge_data(BevVert *bv)
v1 = v2;
}
BMVert *v3 = mesh_vert(vm, (i + 1) % vm->count, 0, 0)->v;
e = v1->e; //Do same as above for first and last vert
e = v1->e; // Do same as above for first and last vert
while (e->v1 != v3 && e->v2 != v3) {
if (e->v1 == v1) {
e = e->v1_disk_link.next;

2
source/blender/bmesh/tools/bmesh_decimate_collapse.c
View File

@ -204,7 +204,7 @@ static bool bm_edge_collapse_is_degenerate_flip(BMEdge *e, const float optimize_
/* use a small value rather then zero so we don't flip a face in multiple steps
* (first making it zero area, then flipping again) */
if (dot_v3v3(cross_exist, cross_optim) <= FLT_EPSILON) {
//printf("no flip\n");
// printf("no flip\n");
return true;
}
#endif

2
source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
View File

@ -264,7 +264,7 @@ void BM_mesh_decimate_unsubdivide_ex(BMesh *bm, const int iterations, const bool
}
else {
/* works better to allow these verts to be checked again */
//BM_elem_index_set(v, VERT_INDEX_IGNORE); /* set_dirty! */
// BM_elem_index_set(v, VERT_INDEX_IGNORE); /* set_dirty! */
}
}
}

2
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -1439,7 +1439,7 @@ void DepsgraphNodeBuilder::build_compositor(Scene *scene)
/* For now, just a plain wrapper? */
// TODO: create compositing component?
// XXX: component type undefined!
//graph->get_node(&scene->id, NULL, NodeType::COMPOSITING, NULL);
// graph->get_node(&scene->id, NULL, NodeType::COMPOSITING, NULL);
/* for now, nodetrees are just parameters; compositing occurs in internals
* of renderer... */

12
source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
View File

@ -95,14 +95,14 @@ bool RootPChanMap::has_common_root(const char *bone1, const char *bone2)
{
/* Ensure that both are in the map... */
if (BLI_ghash_haskey(map_, bone1) == false) {
//fprintf("RootPChanMap: bone1 '%s' not found (%s => %s)\n", bone1, bone1, bone2);
//print_debug();
// fprintf("RootPChanMap: bone1 '%s' not found (%s => %s)\n", bone1, bone1, bone2);
// print_debug();
return false;
}
if (BLI_ghash_haskey(map_, bone2) == false) {
//fprintf("RootPChanMap: bone2 '%s' not found (%s => %s)\n", bone2, bone1, bone2);
//print_debug();
// fprintf("RootPChanMap: bone2 '%s' not found (%s => %s)\n", bone2, bone1, bone2);
// print_debug();
return false;
}
@ -116,13 +116,13 @@ bool RootPChanMap::has_common_root(const char *bone1, const char *bone2)
const char *v2 = (const char *)BLI_gsetIterator_getKey(&it2);
if (strcmp(v1, v2) == 0) {
//fprintf("RootPchanMap: %s in common for %s => %s\n", v1, bone1, bone2);
// fprintf("RootPchanMap: %s in common for %s => %s\n", v1, bone1, bone2);
return true;
}
}
}
//fprintf("RootPChanMap: No common root found (%s => %s)\n", bone1, bone2);
// fprintf("RootPChanMap: No common root found (%s => %s)\n", bone1, bone2);
return false;
}

2
source/blender/depsgraph/intern/depsgraph_query_filter.cc
View File

@ -162,7 +162,7 @@ static void deg_filter_remove_unwanted_ids(Depsgraph *graph, GSet *retained_ids)
}
}
} //namespace DEG
} // namespace DEG
/* *************************************************** */
/* Graph Filtering API */

2
source/blender/depsgraph/intern/node/deg_node_component.cc
View File

@ -335,7 +335,7 @@ void BoneComponentNode::init(const ID *id, const char *subdata)
/* name of component comes is bone name */
/* TODO(sergey): This sets name to an empty string because subdata is
* empty. Is it a bug? */
//this->name = subdata;
// this->name = subdata;
/* bone-specific node data */
Object *object = (Object *)id;

12
source/blender/editors/animation/anim_channels_defines.c
View File

@ -361,7 +361,7 @@ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale)
offset += (short)(0.7f * U.widget_unit);
/* If not in Action Editor mode, action-groups (and their children)
* must carry some offset too. */
* must carry some offset too. */
}
else if (ac->datatype != ANIMCONT_ACTION) {
offset += (short)(0.7f * U.widget_unit);
@ -4526,7 +4526,7 @@ static void draw_setting_widget(bAnimContext *ac,
/* get the base icon for the setting */
switch (setting) {
case ACHANNEL_SETTING_VISIBLE: /* visibility eyes */
//icon = ((enabled) ? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF);
// icon = ((enabled) ? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF);
icon = ICON_VISIBLE_IPO_OFF;
if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE)) {
@ -4551,13 +4551,13 @@ static void draw_setting_widget(bAnimContext *ac,
break;
case ACHANNEL_SETTING_EXPAND: /* expanded triangle */
//icon = ((enabled) ? ICON_TRIA_DOWN : ICON_TRIA_RIGHT);
// icon = ((enabled) ? ICON_TRIA_DOWN : ICON_TRIA_RIGHT);
icon = ICON_TRIA_RIGHT;
tooltip = TIP_("Make channels grouped under this channel visible");
break;
case ACHANNEL_SETTING_SOLO: /* NLA Tracks only */
//icon = ((enabled) ? ICON_SOLO_OFF : ICON_SOLO_ON);
// icon = ((enabled) ? ICON_SOLO_OFF : ICON_SOLO_ON);
icon = ICON_SOLO_OFF;
tooltip = TIP_(
"NLA Track is the only one evaluated in this animation data-block, with all others "
@ -4568,7 +4568,7 @@ static void draw_setting_widget(bAnimContext *ac,
case ACHANNEL_SETTING_PROTECT: /* protected lock */
// TODO: what about when there's no protect needed?
//icon = ((enabled) ? ICON_LOCKED : ICON_UNLOCKED);
// icon = ((enabled) ? ICON_LOCKED : ICON_UNLOCKED);
icon = ICON_UNLOCKED;
if (ale->datatype != ALE_NLASTRIP) {
@ -4599,7 +4599,7 @@ static void draw_setting_widget(bAnimContext *ac,
break;
case ACHANNEL_SETTING_PINNED: /* pin icon */
//icon = ((enabled) ? ICON_PINNED : ICON_UNPINNED);
// icon = ((enabled) ? ICON_PINNED : ICON_UNPINNED);
icon = ICON_UNPINNED;
if (ale->type == ANIMTYPE_NLAACTION) {

11
source/blender/editors/animation/anim_channels_edit.c
View File

@ -550,8 +550,8 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac,
if (prevLevel == 0) {
break;
/* otherwise, this level weaves into another sibling hierarchy to the previous one just
* finished, so skip until we get to the parent of this level
*/
* finished, so skip until we get to the parent of this level
*/
}
else {
continue;
@ -583,9 +583,10 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac,
if (level > matchLevel) {
ANIM_channel_setting_set(ac, ale, setting, mode);
/* however, if the level is 'less than or equal to' the channel that was changed,
* (i.e. the current channel is as important if not more important than the changed channel)
* then we should stop, since we've found the last one of the children we should flush
*/
* (i.e. the current channel is as important if not more important than the changed
* channel) then we should stop, since we've found the last one of the children we should
* flush
*/
}
else {
break;

2
source/blender/editors/animation/anim_deps.c
View File

@ -377,7 +377,7 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data)
if (ale->update & ANIM_UPDATE_ORDER) {
ale->update &= ~ANIM_UPDATE_ORDER;
if (gpl) {
//gpencil_sort_frames(gpl);
// gpencil_sort_frames(gpl);
}
}

2
source/blender/editors/animation/anim_draw.c
View File

@ -169,7 +169,7 @@ void ANIM_draw_previewrange(const bContext *C, View2D *v2d, int end_frame_width)
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformThemeColorShadeAlpha(TH_ANIM_PREVIEW_RANGE, -25, -30);
/* XXX: Fix this hardcoded color (anim_active) */
//immUniformColor4f(0.8f, 0.44f, 0.1f, 0.2f);
// immUniformColor4f(0.8f, 0.44f, 0.1f, 0.2f);
/* only draw two separate 'curtains' if there's no overlap between them */
if (PSFRA < PEFRA + end_frame_width) {

10
source/blender/editors/animation/anim_filter.c
View File

@ -117,7 +117,7 @@ static void animedit_get_yscale_factor(bAnimContext *ac)
if (ac->yscale_fac < 0.1f) {
ac->yscale_fac = 1.0f;
}
//printf("yscale_fac = %f\n", ac->yscale_fac);
// printf("yscale_fac = %f\n", ac->yscale_fac);
}
/* ----------- Private Stuff - Action Editor ------------- */
@ -136,7 +136,7 @@ static Key *actedit_get_shapekeys(bAnimContext *ac)
}
/* XXX pinning is not available in 'ShapeKey' mode... */
//if (saction->pin) return NULL;
// if (saction->pin) return NULL;
/* shapekey data is stored with geometry data */
key = BKE_key_from_object(ob);
@ -218,7 +218,7 @@ static bool actedit_get_context(bAnimContext *ac, SpaceAction *saction)
{
/* TODO, other methods to get the mask */
// Sequence *seq = BKE_sequencer_active_get(ac->scene);
//MovieClip *clip = ac->scene->clip;
// MovieClip *clip = ac->scene->clip;
// struct Mask *mask = seq ? seq->mask : NULL;
/* update scene-pointer (no need to check for pinning yet, as not implemented) */
@ -1324,7 +1324,7 @@ static size_t animfilter_act_group(bAnimContext *ac,
ListBase tmp_data = {NULL, NULL};
size_t tmp_items = 0;
size_t items = 0;
//int ofilter = filter_mode;
// int ofilter = filter_mode;
/* if we care about the selection status of the channels,
* but the group isn't expanded (1)...
@ -1384,7 +1384,7 @@ static size_t animfilter_act_group(bAnimContext *ac,
/* add this group as a channel first */
if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
/* restore original filter mode so that this next step works ok... */
//filter_mode = ofilter;
// filter_mode = ofilter;
/* filter selection of channel specially here again,
* since may be open and not subject to previous test */

2
source/blender/editors/animation/anim_markers.c
View File

@ -203,7 +203,7 @@ void ED_markers_get_minmax(ListBase *markers, short sel, float *first, float *la
float min, max;
/* sanity check */
//printf("markers = %p - %p, %p\n", markers, markers->first, markers->last);
// printf("markers = %p - %p, %p\n", markers, markers->first, markers->last);
if (ELEM(NULL, markers, markers->first, markers->last)) {
*first = 0.0f;
*last = 0.0f;

8
source/blender/editors/animation/drivers.c
View File

@ -1140,7 +1140,7 @@ void ANIM_OT_driver_button_remove(wmOperatorType *ot)
/* callbacks */
ot->exec = remove_driver_button_exec;
//op->poll = ??? // TODO: need to have some driver to be able to do this...
// op->poll = ??? // TODO: need to have some driver to be able to do this...
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
@ -1177,7 +1177,7 @@ void ANIM_OT_driver_button_edit(wmOperatorType *ot)
/* callbacks */
ot->exec = edit_driver_button_exec;
//op->poll = ??? // TODO: need to have some driver to be able to do this...
// op->poll = ??? // TODO: need to have some driver to be able to do this...
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
@ -1221,7 +1221,7 @@ void ANIM_OT_copy_driver_button(wmOperatorType *ot)
/* callbacks */
ot->exec = copy_driver_button_exec;
//op->poll = ??? // TODO: need to have some driver to be able to do this...
// op->poll = ??? // TODO: need to have some driver to be able to do this...
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
@ -1270,7 +1270,7 @@ void ANIM_OT_paste_driver_button(wmOperatorType *ot)
/* callbacks */
ot->exec = paste_driver_button_exec;
//op->poll = ??? // TODO: need to have some driver to be able to do this...
// op->poll = ??? // TODO: need to have some driver to be able to do this...
/* flags */
ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;

4
source/blender/editors/animation/keyingsets.c
View File

@ -377,7 +377,7 @@ void ANIM_OT_keyingset_button_add(wmOperatorType *ot)
/* callbacks */
ot->exec = add_keyingset_button_exec;
//op->poll = ???
// op->poll = ???
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@ -459,7 +459,7 @@ void ANIM_OT_keyingset_button_remove(wmOperatorType *ot)
/* callbacks */
ot->exec = remove_keyingset_button_exec;
//op->poll = ???
// op->poll = ???
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;

4
source/blender/editors/armature/armature_relations.c
View File

@ -296,7 +296,7 @@ int join_armature_exec(bContext *C, wmOperator *op)
/* Get Pose of current armature */
opose = ob_iter->pose;
ob_iter->mode &= ~OB_MODE_POSE;
//BASACT->flag &= ~OB_MODE_POSE;
// BASACT->flag &= ~OB_MODE_POSE;
/* Find the difference matrix */
invert_m4_m4(oimat, ob_active->obmat);
@ -612,7 +612,7 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
oldob = obedit;
oldbase = base_iter;
oldob->mode &= ~OB_MODE_POSE;
//oldbase->flag &= ~OB_POSEMODE;
// oldbase->flag &= ~OB_POSEMODE;
ED_armature_from_edit(bmain, obedit->data);
ED_armature_edit_free(obedit->data);

4
source/blender/editors/armature/meshlaplacian.c
View File

@ -365,7 +365,7 @@ int laplacian_system_solve(LaplacianSystem *sys)
{
sys->variablesdone = false;
//EIG_linear_solver_print_matrix(sys->context, );
// EIG_linear_solver_print_matrix(sys->context, );
return EIG_linear_solver_solve(sys->context);
}
@ -451,7 +451,7 @@ static void heat_ray_tree_create(LaplacianSystem *sys)
BLI_bvhtree_insert(sys->heat.bvhtree, a, bb, 2);
//Setup inverse pointers to use on isect.orig
// Setup inverse pointers to use on isect.orig
sys->heat.vltree[vtri[0]] = lt;
sys->heat.vltree[vtri[1]] = lt;
sys->heat.vltree[vtri[2]] = lt;

8
source/blender/editors/armature/pose_lib.c
View File

@ -1455,7 +1455,7 @@ static int poselib_preview_handle_event(bContext *UNUSED(C), wmOperator *op, con
case PADMINUS:
case MIDDLEMOUSE:
case MOUSEMOVE:
//pld->redraw = PL_PREVIEW_REDRAWHEADER;
// pld->redraw = PL_PREVIEW_REDRAWHEADER;
ret = OPERATOR_PASS_THROUGH;
break;
@ -1587,7 +1587,7 @@ static int poselib_preview_handle_event(bContext *UNUSED(C), wmOperator *op, con
*/
case MIDDLEMOUSE:
case MOUSEMOVE:
//pld->redraw = PL_PREVIEW_REDRAWHEADER;
// pld->redraw = PL_PREVIEW_REDRAWHEADER;
ret = OPERATOR_PASS_THROUGH;
break;
@ -1610,7 +1610,7 @@ static int poselib_preview_handle_event(bContext *UNUSED(C), wmOperator *op, con
}
else {
/* view manipulation (see above) */
//pld->redraw = PL_PREVIEW_REDRAWHEADER;
// pld->redraw = PL_PREVIEW_REDRAWHEADER;
ret = OPERATOR_PASS_THROUGH;
}
break;
@ -1748,7 +1748,7 @@ static void poselib_preview_cleanup(bContext *C, wmOperator *op)
/* updates */
if (IS_AUTOKEY_MODE(scene, NORMAL)) {
//remake_action_ipos(ob->action);
// remake_action_ipos(ob->action);
}
else {
BKE_pose_where_is(CTX_data_depsgraph(C), scene, ob);

2
source/blender/editors/armature/pose_slide.c
View File

@ -510,7 +510,7 @@ static void pose_slide_apply_props(tPoseSlideOp *pso,
default:
/* cannot handle */
//printf("Cannot Pose Slide non-numerical property\n");
// printf("Cannot Pose Slide non-numerical property\n");
break;
}
}

2
source/blender/editors/armature/pose_utils.c
View File

@ -342,7 +342,7 @@ void poseAnim_mapping_autoKeyframe(bContext *C, Scene *scene, ListBase *pfLinks,
FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, v3d, OB_ARMATURE, OB_MODE_POSE, ob) {
if (ob->id.tag & LIB_TAG_DOIT) {
if (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS) {
//ED_pose_clear_paths(C, ob); // XXX for now, don't need to clear
// ED_pose_clear_paths(C, ob); // XXX for now, don't need to clear
ED_pose_recalculate_paths(C, scene, ob, false);
}
}

31
source/blender/editors/gpencil/annotate_paint.c
View File

@ -285,17 +285,17 @@ static bool gp_stroke_filtermval(tGPsdata *p, const float mval[2], float pmval[2
return true;
/* check if mouse moved at least certain distance on both axes (best case)
* - aims to eliminate some jitter-noise from input when trying to draw straight lines freehand
*/
* - aims to eliminate some jitter-noise from input when trying to draw straight lines freehand
*/
}
else if ((dx > MIN_MANHATTEN_PX) && (dy > MIN_MANHATTEN_PX)) {
return true;
/* Check if the distance since the last point is significant enough:
* - Prevents points being added too densely
* - Distance here doesn't use sqrt to prevent slowness.
* We should still be safe from overflows though.
*/
* - Prevents points being added too densely
* - Distance here doesn't use sqrt to prevent slowness.
* We should still be safe from overflows though.
*/
}
else if ((dx * dx + dy * dy) > MIN_EUCLIDEAN_PX * MIN_EUCLIDEAN_PX) {
return true;
@ -1361,7 +1361,7 @@ static void gp_paint_initstroke(tGPsdata *p, eGPencil_PaintModes paintmode, Deps
if (has_layer_to_erase == false) {
p->status = GP_STATUS_CAPTURE;
//if (G.debug & G_DEBUG)
// if (G.debug & G_DEBUG)
printf("Error: Eraser will not be affecting anything (gpencil_paint_init)\n");
return;
}
@ -1544,14 +1544,13 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
immUniform1f("dash_width", 12.0f);
immUniform1f("dash_factor", 0.5f);
imm_draw_circle_wire_2d(
shdr_pos,
x,
y,
p->radius,
/* XXX Dashed shader gives bad results with sets of small segments currently,
* temp hack around the issue. :( */
max_ii(8, p->radius / 2)); /* was fixed 40 */
imm_draw_circle_wire_2d(shdr_pos,
x,
y,
p->radius,
/* XXX Dashed shader gives bad results with sets of small segments
* currently, temp hack around the issue. :( */
max_ii(8, p->radius / 2)); /* was fixed 40 */
immUnbindProgram();
@ -2234,7 +2233,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
}
}
//printf("\tGP - handle modal event...\n");
// printf("\tGP - handle modal event...\n");
/* Exit painting mode (and/or end current stroke)
*

2
source/blender/editors/gpencil/drawgpencil.c
View File

@ -919,7 +919,7 @@ static void gp_draw_strokes(tGPDdraw *tgpw)
}
/* 3D Fill */
//if ((dflag & GP_DRAWDATA_FILL) && (gps->totpoints >= 3)) {
// if ((dflag & GP_DRAWDATA_FILL) && (gps->totpoints >= 3)) {
if ((gps->totpoints >= 3) && (tgpw->disable_fill != 1)) {
/* set color using material, tint color and opacity */
interp_v3_v3v3(tfill, gp_style->fill_rgba, tgpw->tintcolor, tgpw->tintcolor[3]);

4
source/blender/editors/gpencil/gpencil_brush.c
View File

@ -1326,7 +1326,7 @@ static bool gpsculpt_brush_init(bContext *C, wmOperator *op)
gpsculpt_brush_header_set(C, gso);
/* setup cursor drawing */
//WM_cursor_modal_set(CTX_wm_window(C), BC_CROSSCURSOR);
// WM_cursor_modal_set(CTX_wm_window(C), BC_CROSSCURSOR);
if (gso->sa->spacetype != SPACE_VIEW3D) {
ED_gpencil_toggle_brush_cursor(C, true, NULL);
}
@ -2007,7 +2007,7 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
/* Painting mbut release = Stop painting (back to idle) */
case LEFTMOUSE:
//BLI_assert(event->val == KM_RELEASE);
// BLI_assert(event->val == KM_RELEASE);
if (is_modal) {
/* go back to idling... */
gso->is_painting = false;

4
source/blender/editors/gpencil/gpencil_edit.c
View File

@ -619,7 +619,7 @@ static void gp_duplicate_points(const bGPDstroke *gps,
else if (i == gps->totpoints - 1) {
len = i - start_idx + 1;
}
//printf("copying from %d to %d = %d\n", start_idx, i, len);
// printf("copying from %d to %d = %d\n", start_idx, i, len);
/* make copies of the relevant data */
if (len) {
@ -1212,7 +1212,7 @@ void GPENCIL_OT_copy(wmOperatorType *ot)
ot->poll = gp_stroke_edit_poll;
/* flags */
//ot->flag = OPTYPE_REGISTER;
// ot->flag = OPTYPE_REGISTER;
}
/* --------------------- */

2
source/blender/editors/gpencil/gpencil_fill.c
View File

@ -455,7 +455,7 @@ static void get_pixel(const ImBuf *ibuf, const int idx, float r_col[4])
/* set pixel data (rgba) at index */
static void set_pixel(ImBuf *ibuf, int idx, const float col[4])
{
//BLI_assert(idx <= ibuf->x * ibuf->y);
// BLI_assert(idx <= ibuf->x * ibuf->y);
if (ibuf->rect) {
uint *rrect = &ibuf->rect[idx];
uchar ccol[4];

25
source/blender/editors/gpencil/gpencil_paint.c
View File

@ -372,10 +372,10 @@ static bool gp_stroke_filtermval(tGPsdata *p, const float mval[2], float mvalo[2
return true;
/* Check if the distance since the last point is significant enough:
* - Prevents points being added too densely
* - Distance here doesn't use sqrt to prevent slowness.
* We should still be safe from overflows though.
*/
* - Prevents points being added too densely
* - Distance here doesn't use sqrt to prevent slowness.
* We should still be safe from overflows though.
*/
}
else if ((dx * dx + dy * dy) > MIN_EUCLIDEAN_PX * MIN_EUCLIDEAN_PX) {
return true;
@ -2319,14 +2319,13 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
immUniform1f("dash_width", 12.0f);
immUniform1f("dash_factor", 0.5f);
imm_draw_circle_wire_2d(
shdr_pos,
x,
y,
p->radius,
/* XXX Dashed shader gives bad results with sets of small segments currently,
* temp hack around the issue. :( */
max_ii(8, p->radius / 2)); /* was fixed 40 */
imm_draw_circle_wire_2d(shdr_pos,
x,
y,
p->radius,
/* XXX Dashed shader gives bad results with sets of small segments
* currently, temp hack around the issue. :( */
max_ii(8, p->radius / 2)); /* was fixed 40 */
immUnbindProgram();
@ -3508,7 +3507,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
}
}
//printf("\tGP - handle modal event...\n");
// printf("\tGP - handle modal event...\n");
/* Exit painting mode (and/or end current stroke).
*

6
source/blender/editors/gpencil/gpencil_undo.c
View File

@ -68,7 +68,7 @@ int ED_undo_gpencil_step(bContext *C, int step, const char *name)
gpd_ptr = ED_gpencil_data_get_pointers(C, NULL);
if (step == 1) { /* undo */
//printf("\t\tGP - undo step\n");
// printf("\t\tGP - undo step\n");
if (cur_node->prev) {
if (!name || STREQ(cur_node->name, name)) {
cur_node = cur_node->prev;
@ -77,7 +77,7 @@ int ED_undo_gpencil_step(bContext *C, int step, const char *name)
}
}
else if (step == -1) {
//printf("\t\tGP - redo step\n");
// printf("\t\tGP - redo step\n");
if (cur_node->next) {
if (!name || STREQ(cur_node->name, name)) {
cur_node = cur_node->next;
@ -134,7 +134,7 @@ void gpencil_undo_push(bGPdata *gpd)
{
bGPundonode *undo_node;
//printf("\t\tGP - undo push\n");
// printf("\t\tGP - undo push\n");
if (cur_node) {
/* remove all un-done nodes from stack */

17
source/blender/editors/gpencil/gpencil_utils.c
View File

@ -1689,14 +1689,13 @@ void ED_gpencil_brush_draw_eraser(Brush *brush, int x, int y)
immUniform1f("dash_width", 12.0f);
immUniform1f("dash_factor", 0.5f);
imm_draw_circle_wire_2d(
shdr_pos,
x,
y,
radius,
/* XXX Dashed shader gives bad results with sets of small segments currently,
* temp hack around the issue. :( */
max_ii(8, radius / 2)); /* was fixed 40 */
imm_draw_circle_wire_2d(shdr_pos,
x,
y,
radius,
/* XXX Dashed shader gives bad results with sets of small segments
* currently, temp hack around the issue. :( */
max_ii(8, radius / 2)); /* was fixed 40 */
immUnbindProgram();
@ -2514,7 +2513,7 @@ void ED_gpencil_select_toggle_all(bContext *C, int action)
case SEL_SELECT:
pt->flag |= GP_SPOINT_SELECT;
break;
//case SEL_DESELECT:
// case SEL_DESELECT:
// pt->flag &= ~GP_SPOINT_SELECT;
// break;
case SEL_INVERT:

6
source/blender/editors/interface/interface.c
View File

@ -1299,10 +1299,10 @@ static bool ui_but_event_property_operator_string(const bContext *C,
}
}
else {
//puts("other id");
// puts("other id");
}
//printf("prop shortcut: '%s' (%s)\n", RNA_property_identifier(prop), data_path);
// printf("prop shortcut: '%s' (%s)\n", RNA_property_identifier(prop), data_path);
}
/* we have a datapath! */
@ -1615,7 +1615,7 @@ void ui_fontscale(short *points, float aspect)
/* for some reason scaling fonts goes too fast compared to widget size */
/* XXX not true anymore? (ton) */
//aspect = sqrt(aspect);
// aspect = sqrt(aspect);
pointsf /= aspect;
if (aspect > 1.0f) {

2
source/blender/editors/interface/interface_handlers.c
View File

@ -3797,7 +3797,7 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
#endif
/* this makes adjacent blocks auto open from now on */
//if (but->block->auto_open == 0) {
// if (but->block->auto_open == 0) {
// but->block->auto_open = 1;
//}
}

2
source/blender/editors/interface/interface_layout.c
View File

@ -840,7 +840,7 @@ static void ui_item_enum_expand_exec(uiLayout *layout,
/* Separate items, potentially with a label. */
if (next_item->identifier) {
/* Item without identifier but with name:
* Add group label for the following items. */
* Add group label for the following items. */
if (item->name) {
if (!is_first) {
uiItemS(block->curlayout);

15
source/blender/editors/interface/interface_panel.c
View File

@ -701,11 +701,10 @@ void ui_draw_aligned_panel(uiStyle *style,
const bool is_closed_x = (panel->flag & PNL_CLOSEDX) ? true : false;
const bool is_closed_y = (panel->flag & PNL_CLOSEDY) ? true : false;
const bool is_subpanel = (panel->type && panel->type->parent);
const bool show_drag =
(!is_subpanel &&
/* FIXME(campbell): currently no background means floating panel which can't be dragged.
* This may be changed in future. */
show_background);
const bool show_drag = (!is_subpanel &&
/* FIXME(campbell): currently no background means floating panel which
* can't be dragged. This may be changed in future. */
show_background);
if (panel->paneltab) {
return;
@ -1672,7 +1671,7 @@ static void ui_handle_panel_header(
if (mx <= block->rect.xmax - 8 - PNL_ICON) {
button = 2;
}
//else if (mx <= block->rect.xmin + 10 + 2 * PNL_ICON + 2) {
// else if (mx <= block->rect.xmin + 10 + 2 * PNL_ICON + 2) {
// button = 1;
//}
}
@ -2064,7 +2063,7 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
BLF_enable(fontid, BLF_ROTATION);
BLF_rotation(fontid, M_PI_2);
//UI_fontstyle_set(&style->widget);
// UI_fontstyle_set(&style->widget);
ui_fontscale(&fstyle_points, aspect / (U.pixelsize * 1.1f));
BLF_size(fontid, fstyle_points, U.dpi);
@ -2569,7 +2568,7 @@ static void panel_activate_state(const bContext *C, Panel *pa, uiHandlePanelStat
* is very hard to control and use, and has no real benefit." - BillRey
* Aligorith, 2009Sep
*/
//test_add_new_tabs(ar); // also copies locations of tabs in dragged panel
// test_add_new_tabs(ar); // also copies locations of tabs in dragged panel
check_panel_overlap(ar, NULL); /* clears */
}

2
source/blender/editors/interface/interface_region_search.c
View File

@ -598,7 +598,7 @@ ARegion *ui_searchbox_create_generic(bContext *C, ARegion *butregion, uiBut *but
winx = WM_window_pixels_x(win);
// winy = WM_window_pixels_y(win); /* UNUSED */
//wm_window_get_size(win, &winx, &winy);
// wm_window_get_size(win, &winx, &winy);
if (rect_i.xmax > winx) {
/* super size */

2
source/blender/editors/interface/interface_region_tooltip.c
View File

@ -1063,7 +1063,7 @@ static ARegion *ui_tooltip_create_with_data(bContext *C,
field->geom.x_pos = x_pos;
}
//fontw *= aspect;
// fontw *= aspect;
BLF_disable(data->fstyle.uifont_id, font_flag);
BLF_disable(blf_mono_font, font_flag);

12
source/blender/editors/interface/interface_templates.c
View File

@ -798,7 +798,7 @@ static void template_ID(bContext *C,
char name[UI_MAX_NAME_STR];
const bool user_alert = (id->us <= 0);
//text_idbutton(id, name);
// text_idbutton(id, name);
name[0] = '\0';
but = uiDefButR(block,
UI_BTYPE_TEXT,
@ -4997,7 +4997,7 @@ static void uilist_filter_items_default(struct uiList *ui_list,
dyn_data->items_shown++;
do_order = order_by_name;
}
//printf("%s: '%s' matches '%s'\n", __func__, name, filter);
// printf("%s: '%s' matches '%s'\n", __func__, name, filter);
}
else if (filter_exclude) {
dyn_data->items_shown++;
@ -5321,16 +5321,16 @@ void uiTemplateList(uiLayout *layout,
dyn_data->items_len = dyn_data->items_shown = RNA_property_collection_length(dataptr, prop);
}
else {
//printf("%s: filtering...\n", __func__);
// printf("%s: filtering...\n", __func__);
filter_items(ui_list, C, dataptr, propname);
//printf("%s: filtering done.\n", __func__);
// printf("%s: filtering done.\n", __func__);
}
items_shown = dyn_data->items_shown;
if (items_shown >= 0) {
bool activei_mapping_pending = true;
items_ptr = MEM_mallocN(sizeof(_uilist_item) * items_shown, __func__);
//printf("%s: items shown: %d.\n", __func__, items_shown);
// printf("%s: items shown: %d.\n", __func__, items_shown);
RNA_PROP_BEGIN (dataptr, itemptr, prop) {
if (!dyn_data->items_filter_flags ||
((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude)) {
@ -5342,7 +5342,7 @@ void uiTemplateList(uiLayout *layout,
else {
ii = order_reverse ? items_shown - ++idx : idx++;
}
//printf("%s: ii: %d\n", __func__, ii);
// printf("%s: ii: %d\n", __func__, ii);
items_ptr[ii].item = itemptr;
items_ptr[ii].org_idx = i;
items_ptr[ii].flt_flag = dyn_data->items_filter_flags ? dyn_data->items_filter_flags[i] :

6
source/blender/editors/interface/interface_widgets.c
View File

@ -2787,8 +2787,8 @@ static void widget_menu_back(uiWidgetColors *wcol, rcti *rect, int flag, int dir
/* menu is 2nd level or deeper */
if (flag & UI_BLOCK_POPUP) {
//rect->ymin -= 4.0;
//rect->ymax += 4.0;
// rect->ymin -= 4.0;
// rect->ymax += 4.0;
}
else if (direction == UI_DIR_DOWN) {
roundboxalign = (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT);
@ -4686,7 +4686,7 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
}
if (wt) {
//rcti disablerect = *rect; /* rect gets clipped smaller for text */
// rcti disablerect = *rect; /* rect gets clipped smaller for text */
int roundboxalign, state, drawflag;
bool disabled = false;

4
source/blender/editors/io/io_collada.c
View File

@ -174,7 +174,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
/* get editmode results */
ED_object_editmode_load(bmain, CTX_data_edit_object(C));
//Scene *scene = CTX_data_scene(C);
// Scene *scene = CTX_data_scene(C);
ExportSettings export_settings;
@ -748,7 +748,7 @@ void WM_OT_collada_import(wmOperatorType *ot)
ot->exec = wm_collada_import_exec;
ot->poll = WM_operator_winactive;
//ot->flag |= OPTYPE_PRESET;
// ot->flag |= OPTYPE_PRESET;
ot->ui = wm_collada_import_draw;

2
source/blender/editors/mask/mask_ops.c
View File

@ -245,7 +245,7 @@ bool ED_mask_feather_find_nearest(const bContext *C,
MaskSpline *spline;
for (spline = masklay->splines.first; spline; spline = spline->next) {
//MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
// MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
int i, tot_feather_point;
float(*feather_points)[2], (*fp)[2];

2
source/blender/editors/mask/mask_relationships.c
View File

@ -184,7 +184,7 @@ void MASK_OT_parent_set(wmOperatorType *ot)
ot->idname = "MASK_OT_parent_set";
/* api callbacks */
//ot->invoke = mask_parent_set_invoke;
// ot->invoke = mask_parent_set_invoke;
ot->exec = mask_parent_set_exec;
ot->poll = ED_space_clip_maskedit_mask_poll;

Some files were not shown because too many files have changed in this diff Show More