archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: stray tabs

Browse Source 
Tabs in middle of code (mostly for no reason / by accident).
This commit is contained in:
Campbell Barton
2018-03-23 11:51:19 +01:00
parent f2f32c81d4
commit 7cc2b27099
23 changed files with 115 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -640,7 +640,7 @@ void cloth_free_modifier_extern(ClothModifierData *clmd )
**/
static void cloth_to_object (Object *ob, ClothModifierData *clmd, float (*vertexCos)[3])
{
unsigned int i = 0;
unsigned int i = 0;
Cloth *cloth = clmd->clothObject;
if (clmd->clothObject) {

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

@@ -178,8 +178,8 @@ static void collision_compute_barycentric ( float pv[3], float p1[3], float p2[3
/* dot_v3v3 */
#define INPR(v1, v2) ( (v1)[0] * (v2)[0] + (v1)[1] * (v2)[1] + (v1)[2] * (v2)[2])
double tempV1[3], tempV2[3], tempV4[3];
double a, b, c, d, e, f;
double tempV1[3], tempV2[3], tempV4[3];
double a, b, c, d, e, f;
VECSUB ( tempV1, p1, p3 );
VECSUB ( tempV2, p2, p3 );

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

@@ -54,7 +54,7 @@
#include "BKE_animsys.h"
#include "BKE_armature.h"
#include "BKE_bvhutils.h" /* bvh tree */
#include "BKE_bvhutils.h" /* bvh tree */
#include "BKE_colorband.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_constraint.h"
@@ -4518,7 +4518,7 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
*/
tree = BLI_kdtree_new(psys->totpart);
/* loop through particles and insert valid ones to the tree */
/* loop through particles and insert valid ones to the tree */
p = 0;
for (ParticleData *pa = psys->particles; p < psys->totpart; p++, pa++) {
/* Proceed only if particle is active */

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

@@ -62,8 +62,8 @@ typedef union {
} EdgeUUID;
typedef struct SortFace {
EdgeUUID es[4];
unsigned int index;
EdgeUUID es[4];
unsigned int index;
} SortFace;
/* Used to detect polys (faces) using exactly the same vertices. */
@@ -126,28 +126,28 @@ static int search_face_cmp(const void *v1, const void *v2)
if (sfa->es[0].edval > sfb->es[0].edval) {
return 1;
}
else if (sfa->es[0].edval < sfb->es[0].edval) {
else if (sfa->es[0].edval < sfb->es[0].edval) {
return -1;
}
else if (sfa->es[1].edval > sfb->es[1].edval) {
else if (sfa->es[1].edval > sfb->es[1].edval) {
return 1;
}
else if (sfa->es[1].edval < sfb->es[1].edval) {
else if (sfa->es[1].edval < sfb->es[1].edval) {
return -1;
}
else if (sfa->es[2].edval > sfb->es[2].edval) {
else if (sfa->es[2].edval > sfb->es[2].edval) {
return 1;
}
else if (sfa->es[2].edval < sfb->es[2].edval) {
else if (sfa->es[2].edval < sfb->es[2].edval) {
return -1;
}
else if (sfa->es[3].edval > sfb->es[3].edval) {
else if (sfa->es[3].edval > sfb->es[3].edval) {
return 1;
}
else if (sfa->es[3].edval < sfb->es[3].edval) {
else if (sfa->es[3].edval < sfb->es[3].edval) {
return -1;
}

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

@@ -354,16 +354,15 @@ int writePackedFile(ReportList *reports, const char *filename, PackedFile *pf, i
return (ret_value);
}
/*
/**
* This function compares a packed file to a 'real' file.
* It returns an integer indicating if:
*
* PF_EQUAL - the packed file and original file are identical
* PF_DIFFERENT - the packed file and original file differ
* PF_NOFILE - the original file doens't exist
* - PF_EQUAL: the packed file and original file are identical
* - PF_DIFFERENT: the packed file and original file differ
* - PF_NOFILE: the original file doens't exist
*/
int checkPackedFile(const char *filename, PackedFile *pf)
{
BLI_stat_t st;

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

@@ -898,7 +898,7 @@ void BKE_sculpt_update_mesh_elements(Scene *scene, Sculpt *sd, Object *ob,
if (!CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK)) {
#if 1
BKE_sculpt_mask_layers_ensure(ob, mmd);
#else /* if we wanted to support adding mask data while multi-res painting, we would need to do this */
#else /* if we wanted to support adding mask data while multi-res painting, we would need to do this */
if ((ED_sculpt_mask_layers_ensure(ob, mmd) & ED_SCULPT_MASK_LAYER_CALC_LOOP)) {
/* remake the derived mesh */
ob->recalc |= OB_RECALC_DATA;

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

@@ -803,7 +803,7 @@ static void distribute_invalid(Scene *scene, ParticleSystem *psys, int from)
}
}
/* Creates a distribution of coordinates on a DerivedMesh */
/* Creates a distribution of coordinates on a DerivedMesh */
/* This is to denote functionality that does not yet work with mesh - only derived mesh */
static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, ParticleSimulationData *sim, int from)
{
@@ -953,9 +953,9 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, Parti
return 0;
}
element_weight = MEM_callocN(sizeof(float)*totelem, "particle_distribution_weights");
particle_element= MEM_callocN(sizeof(int)*totpart, "particle_distribution_indexes");
jitter_offset = MEM_callocN(sizeof(float)*totelem, "particle_distribution_jitoff");
element_weight = MEM_callocN(sizeof(float) * totelem, "particle_distribution_weights");
particle_element = MEM_callocN(sizeof(int) * totpart, "particle_distribution_indexes");
jitter_offset = MEM_callocN(sizeof(float) * totelem, "particle_distribution_jitoff");
/* Calculate weights from face areas */
if ((part->flag&PART_EDISTR || children) && from != PART_FROM_VERT) {

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

@@ -620,7 +620,7 @@ void BKE_screen_view3d_twmode_remove(View3D *v3d, const int i)
{
const int selected_index = (v3d->twmode - V3D_MANIP_CUSTOM);
if (selected_index == i) {
v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global */
v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global */
}
else if (selected_index > i) {
v3d->twmode--;

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

@@ -473,7 +473,7 @@ MALWAYS_INLINE __m128 _bli_math_fastpow24(const __m128 arg)
*/
/* 0x3F4CCCCD = 4/5 */
/* 0x4F55A7FB = 2^(127/(4/5) - 127) * 0.994^(1/(4/5)) */
/* error max = 0.17 avg = 0.0018 |avg| = 0.05 */
/* error max = 0.17, avg = 0.0018, |avg| = 0.05 */
__m128 x = _bli_math_fastpow(0x3F4CCCCD, 0x4F55A7FB, arg);
__m128 arg2 = _mm_mul_ps(arg, arg);
__m128 arg4 = _mm_mul_ps(arg2, arg2);

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

@@ -3748,7 +3748,7 @@ void orthographic_m4(float matrix[4][4], const float left, const float right, co
matrix[3][0] = -(right + left) / Xdelta;
matrix[1][1] = 2.0f / Ydelta;
matrix[3][1] = -(top + bottom) / Ydelta;
matrix[2][2] = -2.0f / Zdelta; /* note: negate Z */
matrix[2][2] = -2.0f / Zdelta; /* note: negate Z */
matrix[3][2] = -(farClip + nearClip) / Zdelta;
}
@@ -3767,7 +3767,7 @@ void perspective_m4(float mat[4][4], const float left, const float right, const
}
mat[0][0] = nearClip * 2.0f / Xdelta;
mat[1][1] = nearClip * 2.0f / Ydelta;
mat[2][0] = (right + left) / Xdelta; /* note: negate Z */
mat[2][0] = (right + left) / Xdelta; /* note: negate Z */
mat[2][1] = (top + bottom) / Ydelta;
mat[2][2] = -(farClip + nearClip) / Zdelta;
mat[2][3] = -1.0f;

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

@@ -931,13 +931,13 @@ size_t BLI_str_partition_ex(
if (end) {
if (from_right) {
for (tmp = end - 1; (tmp >= str) && (*tmp != *d); tmp--);
if (tmp < str) {
if (tmp < str) {
tmp = NULL;
}
}
else {
tmp = func(str, *d);
if (tmp >= end) {
if (tmp >= end) {
tmp = NULL;
}
}

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

@@ -8104,7 +8104,7 @@ static const char *dataname(short id_code)
case ID_WO: return "Data from WO";
case ID_SCR: return "Data from SCR";
case ID_VF: return "Data from VF";
case ID_TXT : return "Data from TXT";
case ID_TXT: return "Data from TXT";
case ID_SPK: return "Data from SPK";
case ID_SO: return "Data from SO";
case ID_NT: return "Data from NT";

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

@@ -1029,7 +1029,7 @@ static int armature_bone_primitive_add_exec(bContext *C, wmOperator *op)
ED_armature_deselect_all(obedit);
/* Create a bone */
/* Create a bone */
bone = ED_armature_edit_bone_add(obedit->data, name);
copy_v3_v3(bone->head, curs);

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

@@ -601,7 +601,7 @@ void ED_armature_from_edit(bArmature *arm)
if (len_sq <= SQUARE(0.000001f)) { /* FLT_EPSILON is too large? */
EditBone *fBone;
/* Find any bones that refer to this bone */
/* Find any bones that refer to this bone */
for (fBone = arm->edbo->first; fBone; fBone = fBone->next) {
if (fBone->parent == eBone)
fBone->parent = eBone->parent;

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

@@ -227,7 +227,7 @@ void ED_pose_de_selectall(Object *ob, int select_mode, const bool ignore_visibil
return;
}
/* Determine if we're selecting or deselecting */
/* Determine if we're selecting or deselecting */
if (select_mode == SEL_TOGGLE) {
select_mode = SEL_SELECT;
for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {

8
source/blender/editors/interface/view2d.c
View File

@@ -1217,10 +1217,10 @@ static void step_to_grid(float *step, int *power, int unit)
* - Units + clamping args will be checked, to make sure they are valid values that can be used
* so it is very possible that we won't return grid at all!
*
* - xunits,yunits = V2D_UNIT_* grid steps in seconds or frames
* - xclamp,yclamp = V2D_CLAMP_* only show whole-number intervals
* - winx = width of region we're drawing to, note: not used but keeping for completeness.
* - winy = height of region we're drawing into
* - xunits,yunits = V2D_UNIT_* grid steps in seconds or frames
* - xclamp,yclamp = V2D_CLAMP_* only show whole-number intervals
* - winx = width of region we're drawing to, note: not used but keeping for completeness.
* - winy = height of region we're drawing into
*/
View2DGrid *UI_view2d_grid_calc(
Scene *scene, View2D *v2d,

2
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -1937,7 +1937,7 @@ static int edbm_do_smooth_laplacian_vertex_exec(bContext *C, wmOperator *op)
BMIter fiter;
BMFace *f;
/* Check if select faces are triangles */
/* Check if select faces are triangles */
BM_ITER_MESH (f, &fiter, em->bm, BM_FACES_OF_MESH) {
if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
if (f->len > 4) {

2
source/blender/editors/mesh/editmesh_undo.c
View File

@@ -247,7 +247,7 @@ static void um_arraystore_cd_free(BArrayCustomData *bcd)
BArrayCustomData *bcd_next = bcd->next;
const int stride = CustomData_sizeof(bcd->type);
BArrayStore *bs = BLI_array_store_at_size_get(&um_arraystore.bs_stride, stride);
for (int i = 0; i < bcd->states_len; i++) {
for (int i = 0; i < bcd->states_len; i++) {
if (bcd->states[i]) {
BLI_array_store_state_remove(bs, bcd->states[i]);
}

4
source/blender/editors/physics/dynamicpaint_ops.c
View File

@@ -359,7 +359,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job)
scene->r.cfra = (int)frame;
ED_update_for_newframe(job->bmain, scene, 1);
/* Init surface */
/* Init surface */
if (!dynamicPaint_createUVSurface(scene, surface, job->progress, job->do_update)) {
job->success = 0;
return;
@@ -493,7 +493,7 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op)
WM_set_locked_interface(CTX_wm_manager(C), true);
/* Bake Dynamic Paint */
/* Bake Dynamic Paint */
WM_jobs_start(CTX_wm_manager(C), wm_job);
return OPERATOR_FINISHED;

54
source/blender/editors/screen/screen_ops.c
View File

@@ -869,23 +869,23 @@ static void SCREEN_OT_actionzone(wmOperatorType *ot)
/** \name Swap Area Operator
* \{ */
/* operator state vars used:
* sa1 start area
* sa2 area to swap with
*
/* operator state vars used:
* sa1 start area
* sa2 area to swap with
*
* functions:
*
*
* init() set custom data for operator, based on actionzone event custom data
*
* cancel() cancel the operator
*
* exit() cleanup, send notifier
*
*
* cancel() cancel the operator
*
* exit() cleanup, send notifier
*
* callbacks:
*
*
* invoke() gets called on shift+lmb drag in actionzone
* call init(), add handler
*
*
* modal() accept modal events while doing it
*/
@@ -1416,35 +1416,35 @@ static void SCREEN_OT_area_move(wmOperatorType *ot)
/** \name Split Area Operator
* \{ */
/*
* operator state vars:
/*
* operator state vars:
* fac spit point
* dir direction 'v' or 'h'
*
*
* operator customdata:
* area pointer to (active) area
* x, y last used mouse pos
* x, y last used mouse pos
* (more, see below)
*
*
* functions:
*
*
* init() set default property values, find area based on context
*
* apply() split area based on state vars
*
* exit() cleanup, send notifier
*
*
* apply() split area based on state vars
*
* exit() cleanup, send notifier
*
* cancel() remove duplicated area
*
*
* callbacks:
*
*
* exec() execute without any user interaction, based on state vars
* call init(), apply(), exit()
*
*
* invoke() gets called on mouse click in action-widget
* call init(), add modal handler
* call apply() with initial motion
*
*
* modal() accept modal events while doing it
* call move-areas code with delta motion
* call exit() or cancel() and remove handler

84
source/blender/editors/space_text/text_format_pov.c
View File

@@ -486,7 +486,7 @@ static int txtfmt_pov_find_specialvar(const char *string)
{
int i, len;
/* Modifiers */
if (STR_LITERAL_STARTSWITH(string, "dispersion_samples", len)) i = len;
if (STR_LITERAL_STARTSWITH(string, "dispersion_samples", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "projected_through", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "double_illuminate", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "expand_thresholds", len)) i = len;
@@ -498,7 +498,7 @@ static int txtfmt_pov_find_specialvar(const char *string)
else if (STR_LITERAL_STARTSWITH(string, "max_trace_level", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "gray_threshold", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "pretrace_start", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "normal_indices", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "normal_indices", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "normal_vectors", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "vertex_vectors", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "noise_generator", len)) i = len;
@@ -577,7 +577,7 @@ static int txtfmt_pov_find_specialvar(const char *string)
else if (STR_LITERAL_STARTSWITH(string, "autostop", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "caustics", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "octaves", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "aa_level", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "aa_level", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "frequency", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "fog_offset", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "modulation", len)) i = len;
@@ -642,45 +642,45 @@ static int txtfmt_pov_find_specialvar(const char *string)
else if (STR_LITERAL_STARTSWITH(string, "radius", len)) i = len;
/* Camera Types and options*/
else if (STR_LITERAL_STARTSWITH(string, "omni_directional_stereo", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "lambert_cylindrical", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "miller_cylindrical", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "lambert_azimuthal", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "ultra_wide_angle", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_direction", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_location ", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "van_der_grinten", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "aitoff_hammer", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "smyth_craster", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "orthographic", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_right", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "blur_samples", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "plate_carree", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_type", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "perspective", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "mesh_camera", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "focal_point", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "balthasart", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "confidence", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "parallaxe", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "hobo_dyer", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_up", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "panoramic", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "eckert_vi", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "eckert_iv", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "mollweide", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "aperture", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "behrmann", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "variance", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "stereo", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "icosa", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "tetra", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "octa", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "mercator", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "omnimax", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "fisheye", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "edwards", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "peters", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "gall", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "lambert_cylindrical", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "miller_cylindrical", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "lambert_azimuthal", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "ultra_wide_angle", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_direction", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_location ", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "van_der_grinten", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "aitoff_hammer", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "smyth_craster", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "orthographic", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_right", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "blur_samples", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "plate_carree", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_type", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "perspective", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "mesh_camera", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "focal_point", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "balthasart", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "confidence", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "parallaxe", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "hobo_dyer", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "camera_up", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "panoramic", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "eckert_vi", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "eckert_iv", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "mollweide", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "aperture", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "behrmann", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "variance", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "stereo", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "icosa", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "tetra", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "octa", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "mercator", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "omnimax", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "fisheye", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "edwards", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "peters", len)) i = len;
else if (STR_LITERAL_STARTSWITH(string, "gall", len)) i = len;
else i = 0;
/* If next source char is an identifier (eg. 'i' in "definate") no match */

4
source/blender/editors/space_view3d/view3d_select.c
View File

@@ -1986,8 +1986,8 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b
{
Bone *bone;
Object *ob = vc->obact;
unsigned int *vbuffer = NULL; /* selection buffer */
unsigned int *col; /* color in buffer */
unsigned int *vbuffer = NULL; /* selection buffer */
unsigned int *col; /* color in buffer */
int bone_only;
int bone_selected = 0;
int totobj = MAXPICKBUF; /* XXX solve later */

4
source/blender/editors/transform/transform_orientations.c
View File

@@ -70,7 +70,7 @@ void BIF_clearTransformOrientation(bContext *C)
// Need to loop over all view3d
if (v3d && v3d->twmode >= V3D_MANIP_CUSTOM) {
v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global */
v3d->twmode = V3D_MANIP_GLOBAL; /* fallback to global */
}
}
@@ -919,7 +919,7 @@ int getTransformOrientation_ex(const bContext *C, float normal[3], float plane[3
}
else if (is_next_sel) {
/* A segment, add the edge normal */
sub_v3_v3v3(tvec, bp->vec, bp_next->vec );
sub_v3_v3v3(tvec, bp->vec, bp_next->vec);
normalize_v3(tvec);
add_v3_v3(normal, tvec);
}