blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-04-16 17:23:24 +02:00
parent 3a14a03812 95eb9f22e6
commit 9a11aeb300
37 changed files with 228 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/BKE_paint.h
View File

@ -236,9 +236,8 @@ typedef struct SculptSession {
struct MDeformVert *dvert_prev;
} wpaint;
//struct {
//ToDo: identify sculpt-only fields
//} sculpt;
/* TODO: identify sculpt-only fields */
// struct { ... } sculpt;
} mode;
int mode_type;

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

@ -162,8 +162,10 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData *bbd, BoidValues *val,
copy_v3_v3(bbd->goal_nor, efd.nor);
}
}
else if (rule->type == eBoidRuleType_Avoid && bpa->data.mode == eBoidMode_Climbing &&
priority > 2.0f * gabr->fear_factor) {
else if ((rule->type == eBoidRuleType_Avoid) &&
(bpa->data.mode == eBoidMode_Climbing) &&
(priority > 2.0f * gabr->fear_factor))
{
/* detach from surface and try to fly away from danger */
negate_v3_v3(efd.vec_to_point, bpa->gravity);
}
@ -1107,7 +1109,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
/* jump to go faster */
if (jump == 0 && val.jump_speed > val.max_speed && bbd->wanted_speed > val.max_speed) {
/* pass */
}
if (jump) {

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

@ -2630,7 +2630,7 @@ static void distlimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
/* if soft-distance is enabled, start fading once owner is dist+softdist from the target */
else if (data->flag & LIMITDIST_USESOFT) {
if (dist <= (data->dist + data->soft)) {
/* pass */
}
}
}

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

@ -107,7 +107,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity(
}
switch (dtdata_type) {
/* Vertex data */
/* Vertex data */
case DT_TYPE_MDEFORMVERT:
*r_advanced_mixing = true;
*r_threshold = true;
@ -120,7 +120,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity(
case DT_TYPE_BWEIGHT_VERT:
ret = true;
break;
/* Edge data */
/* Edge data */
case DT_TYPE_SHARP_EDGE:
*r_threshold = true;
ret = true;
@ -139,7 +139,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity(
*r_threshold = true;
ret = true;
break;
/* Loop/Poly data */
/* Loop/Poly data */
case DT_TYPE_UV:
ret = true;
break;

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

@ -507,28 +507,28 @@ float effector_falloff(EffectorCache *eff, EffectorData *efd, EffectedPoint *UNU
falloff=0.0f;
else {
switch (eff->pd->falloff) {
case PFIELD_FALL_SPHERE:
falloff*= falloff_func_dist(eff->pd, efd->distance);
break;
case PFIELD_FALL_TUBE:
falloff*= falloff_func_dist(eff->pd, ABS(fac));
if (falloff == 0.0f)
case PFIELD_FALL_SPHERE:
falloff*= falloff_func_dist(eff->pd, efd->distance);
break;
madd_v3_v3v3fl(temp, efd->vec_to_point2, efd->nor, -fac);
r_fac= len_v3(temp);
falloff*= falloff_func_rad(eff->pd, r_fac);
break;
case PFIELD_FALL_CONE:
falloff*= falloff_func_dist(eff->pd, ABS(fac));
if (falloff == 0.0f)
case PFIELD_FALL_TUBE:
falloff*= falloff_func_dist(eff->pd, ABS(fac));
if (falloff == 0.0f)
break;
madd_v3_v3v3fl(temp, efd->vec_to_point2, efd->nor, -fac);
r_fac= len_v3(temp);
falloff*= falloff_func_rad(eff->pd, r_fac);
break;
case PFIELD_FALL_CONE:
falloff*= falloff_func_dist(eff->pd, ABS(fac));
if (falloff == 0.0f)
break;
r_fac= RAD2DEGF(saacos(fac/len_v3(efd->vec_to_point)));
falloff*= falloff_func_rad(eff->pd, r_fac);
r_fac= RAD2DEGF(saacos(fac/len_v3(efd->vec_to_point)));
falloff*= falloff_func_rad(eff->pd, r_fac);
break;
break;
}
}

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

@ -536,18 +536,20 @@ static void initialize_particle_texture(ParticleSimulationData *sim, ParticleDat
psys_get_texture(sim, pa, &ptex, PAMAP_INIT, 0.f);
switch (part->type) {
case PART_EMITTER:
if (ptex.exist < psys_frand(psys, p+125))
pa->flag |= PARS_UNEXIST;
pa->time = part->sta + (part->end - part->sta)*ptex.time;
break;
case PART_HAIR:
if (ptex.exist < psys_frand(psys, p+125))
pa->flag |= PARS_UNEXIST;
pa->time = 0.f;
break;
case PART_FLUID:
break;
case PART_EMITTER:
if (ptex.exist < psys_frand(psys, p + 125)) {
pa->flag |= PARS_UNEXIST;
}
pa->time = part->sta + (part->end - part->sta)*ptex.time;
break;
case PART_HAIR:
if (ptex.exist < psys_frand(psys, p + 125)) {
pa->flag |= PARS_UNEXIST;
}
pa->time = 0.f;
break;
case PART_FLUID:
break;
}
}
@ -1060,8 +1062,10 @@ void reset_particle(ParticleSimulationData *sim, ParticleData *pa, float dtime,
pa->dietime = pa->time + pa->lifetime;
if (sim->psys->pointcache && sim->psys->pointcache->flag & PTCACHE_BAKED &&
sim->psys->pointcache->mem_cache.first) {
if ((sim->psys->pointcache) &&
(sim->psys->pointcache->flag & PTCACHE_BAKED) &&
(sim->psys->pointcache->mem_cache.first))
{
float dietime = psys_get_dietime_from_cache(sim->psys->pointcache, p);
pa->dietime = MIN2(pa->dietime, dietime);
}
@ -3692,11 +3696,11 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra)
/* Note that we could avoid copying sphdata for each thread here (it's only read here),
* but doubt this would gain us anything except confusion... */
{
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
settings.use_threading = (psys->totpart > 100);
settings.userdata_chunk = &sphdata;
settings.userdata_chunk_size = sizeof(sphdata);
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
settings.use_threading = (psys->totpart > 100);
settings.userdata_chunk = &sphdata;
settings.userdata_chunk_size = sizeof(sphdata);
BLI_task_parallel_range(
0, psys->totpart,
&task_data,
@ -3706,11 +3710,11 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra)
/* do global forces & effectors */
{
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
settings.use_threading = (psys->totpart > 100);
settings.userdata_chunk = &sphdata;
settings.userdata_chunk_size = sizeof(sphdata);
ParallelRangeSettings settings;
BLI_parallel_range_settings_defaults(&settings);
settings.use_threading = (psys->totpart > 100);
settings.userdata_chunk = &sphdata;
settings.userdata_chunk_size = sizeof(sphdata);
BLI_task_parallel_range(
0, psys->totpart,
&task_data,

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

@ -441,9 +441,9 @@ static void ptcache_particle_extra_write(void *psys_v, PTCacheMem *pm, int UNUSE
PTCacheExtra *extra = NULL;
if (psys->part->phystype == PART_PHYS_FLUID &&
psys->part->fluid && psys->part->fluid->flag & SPH_VISCOELASTIC_SPRINGS &&
psys->tot_fluidsprings && psys->fluid_springs) {
psys->part->fluid && psys->part->fluid->flag & SPH_VISCOELASTIC_SPRINGS &&
psys->tot_fluidsprings && psys->fluid_springs)
{
extra = MEM_callocN(sizeof(PTCacheExtra), "Point cache: fluid extra data");
extra->type = BPHYS_EXTRA_FLUID_SPRINGS;
@ -790,8 +790,9 @@ static int ptcache_smoke_read(PTCacheFile *pf, void *smoke_v)
/* check if resolution has changed */
if (sds->res[0] != ch_res[0] ||
sds->res[1] != ch_res[1] ||
sds->res[2] != ch_res[2]) {
sds->res[1] != ch_res[1] ||
sds->res[2] != ch_res[2])
{
if (sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN)
reallocate = 1;
else
@ -2214,8 +2215,8 @@ static void ptcache_data_copy(void *from[], void *to[])
{
int i;
for (i=0; i<BPHYS_TOT_DATA; i++) {
/* note, durian file 03.4b_comp crashes if to[i] is not tested
* its NULL, not sure if this should be fixed elsewhere but for now its needed */
/* note, durian file 03.4b_comp crashes if to[i] is not tested
* its NULL, not sure if this should be fixed elsewhere but for now its needed */
if (from[i] && to[i])
memcpy(to[i], from[i], ptcache_data_size[i]);
}

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

@ -1107,8 +1107,9 @@ static void em_combineMaps(EmissionMap *output, EmissionMap *em2, int hires_mult
/* initialize with first input if in range */
if (x >= em1.min[0] && x < em1.max[0] &&
y >= em1.min[1] && y < em1.max[1] &&
z >= em1.min[2] && z < em1.max[2]) {
y >= em1.min[1] && y < em1.max[1] &&
z >= em1.min[2] && z < em1.max[2])
{
int index_in = smoke_get_index(x - em1.min[0], em1.res[0], y - em1.min[1], em1.res[1], z - em1.min[2]);
/* values */
@ -1120,8 +1121,9 @@ static void em_combineMaps(EmissionMap *output, EmissionMap *em2, int hires_mult
/* apply second input if in range */
if (x >= em2->min[0] && x < em2->max[0] &&
y >= em2->min[1] && y < em2->max[1] &&
z >= em2->min[2] && z < em2->max[2]) {
y >= em2->min[1] && y < em2->max[1] &&
z >= em2->min[2] && z < em2->max[2])
{
int index_in = smoke_get_index(x - em2->min[0], em2->res[0], y - em2->min[1], em2->res[1], z - em2->min[2]);
/* values */
@ -1151,8 +1153,9 @@ static void em_combineMaps(EmissionMap *output, EmissionMap *em2, int hires_mult
/* initialize with first input if in range */
if (x >= em1.hmin[0] && x < em1.hmax[0] &&
y >= em1.hmin[1] && y < em1.hmax[1] &&
z >= em1.hmin[2] && z < em1.hmax[2]) {
y >= em1.hmin[1] && y < em1.hmax[1] &&
z >= em1.hmin[2] && z < em1.hmax[2])
{
int index_in = smoke_get_index(x - em1.hmin[0], em1.hres[0], y - em1.hmin[1], em1.hres[1], z - em1.hmin[2]);
/* values */
output->influence_high[index_out] = em1.influence_high[index_in];
@ -1160,8 +1163,9 @@ static void em_combineMaps(EmissionMap *output, EmissionMap *em2, int hires_mult
/* apply second input if in range */
if (x >= em2->hmin[0] && x < em2->hmax[0] &&
y >= em2->hmin[1] && y < em2->hmax[1] &&
z >= em2->hmin[2] && z < em2->hmax[2]) {
y >= em2->hmin[1] && y < em2->hmax[1] &&
z >= em2->hmin[2] && z < em2->hmax[2])
{
int index_in = smoke_get_index(x - em2->hmin[0], em2->hres[0], y - em2->hmin[1], em2->hres[1], z - em2->hmin[2]);
/* values */

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

@ -662,11 +662,13 @@ static void add_2nd_order_roller(Object *ob, float UNUSED(stiffness), int *count
notthis = bs->v2;
}
else {
if (v0 == bs->v2) {
bpo = sb->bpoint+bs->v1;
notthis = bs->v1;
}
else {printf("oops we should not get here - add_2nd_order_springs");}
if (v0 == bs->v2) {
bpo = sb->bpoint+bs->v1;
notthis = bs->v1;
}
else {
printf("oops we should not get here - add_2nd_order_springs");
}
}
if (bpo) {/* so now we have a 2nd order humpdidump */
for (c=bpo->nofsprings;c>0;c--) {
@ -1955,12 +1957,12 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo
/* intitialize */
if (sb) {
/* check conditions for various options */
/* +++ could be done on object level to squeeze out the last bits of it */
do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&& (ob->softflag & OB_SB_SELF));
do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL);
do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES));
/* --- could be done on object level to squeeze out the last bits of it */
/* check conditions for various options */
/* +++ could be done on object level to squeeze out the last bits of it */
do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&& (ob->softflag & OB_SB_SELF));
do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL);
do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES));
/* --- could be done on object level to squeeze out the last bits of it */
}
else {
printf("Error expected a SB here\n");
@ -2755,7 +2757,7 @@ static void apply_spring_memory(Object *ob)
l = len_v3v3(bp1->pos, bp2->pos);
r = bs->len/l;
if (( r > 1.05f) || (r < 0.95f)) {
bs->len = ((100.0f - b) * bs->len + b*l)/100.0f;
bs->len = ((100.0f - b) * bs->len + b*l)/100.0f;
}
}
}
@ -2803,10 +2805,10 @@ static void springs_from_mesh(Object *ob)
sb= ob->soft;
if (me && sb) {
/* using bp->origS as a container for spring calcualtions here
* will be overwritten sbObjectStep() to receive
* actual modifier stack positions
*/
/* using bp->origS as a container for spring calcualtions here
* will be overwritten sbObjectStep() to receive
* actual modifier stack positions
*/
if (me->totvert) {
bp= ob->soft->bpoint;
for (a=0; a<me->totvert; a++, bp++) {
@ -3469,16 +3471,16 @@ static void softbody_reset(Object *ob, SoftBody *sb, float (*vertexCos)[3], int
SB_estimate_transform(ob, NULL, NULL, NULL);
}
switch (ob->type) {
case OB_MESH:
if (ob->softflag & OB_SB_FACECOLL) mesh_faces_to_scratch(ob);
break;
case OB_LATTICE:
break;
case OB_CURVE:
case OB_SURF:
break;
default:
break;
case OB_MESH:
if (ob->softflag & OB_SB_FACECOLL) mesh_faces_to_scratch(ob);
break;
case OB_LATTICE:
break;
case OB_CURVE:
case OB_SURF:
break;
default:
break;
}
}

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

@ -77,13 +77,13 @@
SWAP(typeof(stack_a), stack_a, stack_b); \
SWAP(unsigned int, _##stack_a##_index, _##stack_b##_index); \
_STACK_SWAP_TOTALLOC(stack_a, stack_b); \
} ((void)0)
} ((void)0)
#else
#define STACK_SWAP(stack_a, stack_b) { \
SWAP(void *, stack_a, stack_b); \
SWAP(unsigned int, _##stack_a##_index, _##stack_b##_index); \
_STACK_SWAP_TOTALLOC(stack_a, stack_b); \
} ((void)0)
} ((void)0)
#endif
#endif /* __BLI_UTILDEFINES_STACK_H__ */

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

@ -3873,8 +3873,8 @@ static void direct_link_text(FileData *fd, Text *text)
#if 0
if (text->flags & TXT_ISEXT) {
BKE_text_reload(text);
}
/* else { */
}
/* else { */
#endif
link_list(fd, &text->lines);

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

@ -944,7 +944,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *main)
}
}
{
/* Warn the user if he is using ["Text"] properties for Font objects */
/* Warn the user if he is using ["Text"] properties for Font objects */
Object *ob;
bProperty *prop;

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

@ -119,7 +119,7 @@ extern const BMAllocTemplate bm_mesh_chunksize_default;
(dm)->getNumEdges(dm), \
(dm)->getNumLoops(dm), \
(dm)->getNumPolys(dm), \
}
}
#define _VA_BMALLOC_TEMPLATE_FROM_DM_2(dm_a, dm_b) { \
(CHECK_TYPE_INLINE(dm_a, DerivedMesh *), \
CHECK_TYPE_INLINE(dm_b, DerivedMesh *), \
@ -127,7 +127,7 @@ extern const BMAllocTemplate bm_mesh_chunksize_default;
(dm_a)->getNumEdges(dm_a) + (dm_b)->getNumEdges(dm_b), \
(dm_a)->getNumLoops(dm_a) + (dm_b)->getNumLoops(dm_b), \
(dm_a)->getNumPolys(dm_a) + (dm_b)->getNumPolys(dm_b), \
}
}
#define BMALLOC_TEMPLATE_FROM_DM(...) VA_NARGS_CALL_OVERLOAD(_VA_BMALLOC_TEMPLATE_FROM_DM_, __VA_ARGS__)

10
source/blender/bmesh/intern/bmesh_opdefines.c
View File

@ -112,7 +112,7 @@ static BMOpDefine bmo_smooth_vert_def = {
{"use_axis_x", BMO_OP_SLOT_BOOL}, /* smooth vertices along X axis */
{"use_axis_y", BMO_OP_SLOT_BOOL}, /* smooth vertices along Y axis */
{"use_axis_z", BMO_OP_SLOT_BOOL}, /* smooth vertices along Z axis */
{{'\0'}},
{{'\0'}},
},
{{{'\0'}}}, /* no output */
bmo_smooth_vert_exec,
@ -135,7 +135,7 @@ static BMOpDefine bmo_smooth_laplacian_vert_def = {
{"use_y", BMO_OP_SLOT_BOOL}, /* Smooth object along Y axis */
{"use_z", BMO_OP_SLOT_BOOL}, /* Smooth object along Z axis */
{"preserve_volume", BMO_OP_SLOT_BOOL}, /* Apply volume preservation after smooth */
{{'\0'}},
{{'\0'}},
},
{{{'\0'}}}, /* no output */
bmo_smooth_laplacian_vert_exec,
@ -839,7 +839,7 @@ static BMOpDefine bmo_bmesh_to_mesh_def = {
"bmesh_to_mesh",
/* slots_in */
{
/* pointer to a mesh structure to fill in */
/* pointer to a mesh structure to fill in */
{"mesh", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_MESH}},
/* pointer to an object structure */
{"object", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_OBJECT}},
@ -860,7 +860,7 @@ static BMOpDefine bmo_mesh_to_bmesh_def = {
"mesh_to_bmesh",
/* slots_in */
{
/* pointer to a Mesh structure */
/* pointer to a Mesh structure */
{"mesh", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_MESH}},
/* pointer to an Object structure */
{"object", BMO_OP_SLOT_PTR, {(int)BMO_OP_SLOT_SUBTYPE_PTR_OBJECT}},
@ -1337,7 +1337,7 @@ static BMOpDefine bmo_duplicate_def = {
{"face_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}},
{"boundary_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}},
{"isovert_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}},
{{'\0'}},
{{'\0'}},
},
bmo_duplicate_exec,
(BMO_OPTYPE_FLAG_NORMALS_CALC |

1
source/blender/bmesh/operators/bmo_offset_edgeloops.c
View File

@ -242,6 +242,7 @@ void bmo_offset_edgeloops_exec(BMesh *bm, BMOperator *op)
#if 0
else if (BM_elem_index_get(l->prev->v) == -1) {
if (BM_elem_index_get(l->next->next->v) == -1) {
/* pass */
}
}
#endif

16
source/blender/collada/AnimationImporter.cpp
View File

@ -566,14 +566,16 @@ void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation *
}
case COLLADAFW::Transformation::MATRIX:
/*{
COLLADAFW::Matrix *mat = (COLLADAFW::Matrix*)transform;
COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
switch (binding->animationClass) {
case COLLADAFW::AnimationList::TRANSFORM:
#if 0
{
COLLADAFW::Matrix *mat = (COLLADAFW::Matrix*)transform;
COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
switch (binding->animationClass) {
case COLLADAFW::AnimationList::TRANSFORM:
}
}*/
}
}
#endif
unused_fcurve(curves);
break;
case COLLADAFW::Transformation::SKEW:

6
source/blender/collada/InstanceWriter.cpp
View File

@ -32,9 +32,9 @@
#include "COLLADASWInstanceMaterial.h"
extern "C" {
#include "BKE_customdata.h"
#include "BKE_material.h"
#include "DNA_mesh_types.h"
#include "BKE_customdata.h"
#include "BKE_material.h"
#include "DNA_mesh_types.h"
}
#include "InstanceWriter.h"

5
source/blender/collada/MeshImporter.cpp
View File

@ -705,8 +705,9 @@ void MeshImporter::read_polys(COLLADAFW::Mesh *collada_mesh, Mesh *me)
}
if (collada_meshtype == COLLADAFW::MeshPrimitive::POLYLIST ||
collada_meshtype == COLLADAFW::MeshPrimitive::POLYGONS ||
collada_meshtype == COLLADAFW::MeshPrimitive::TRIANGLES) {
collada_meshtype == COLLADAFW::MeshPrimitive::POLYGONS ||
collada_meshtype == COLLADAFW::MeshPrimitive::TRIANGLES)
{
COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp;
unsigned int start_index = 0;

22
source/blender/collada/collada_utils.cpp
View File

@ -769,17 +769,17 @@ float bc_get_property(Bone *bone, std::string key, float def)
IDProperty *property = bc_get_IDProperty(bone, key);
if (property) {
switch (property->type) {
case IDP_INT:
result = (float)(IDP_Int(property));
break;
case IDP_FLOAT:
result = (float)(IDP_Float(property));
break;
case IDP_DOUBLE:
result = (float)(IDP_Double(property));
break;
default:
result = def;
case IDP_INT:
result = (float)(IDP_Int(property));
break;
case IDP_FLOAT:
result = (float)(IDP_Float(property));
break;
case IDP_DOUBLE:
result = (float)(IDP_Double(property));
break;
default:
result = def;
}
}
return result;

50
source/blender/compositor/operations/COM_CompositorOperation.cpp
View File

@ -152,31 +152,31 @@ void CompositorOperation::executeRegion(rcti *rect, unsigned int /*tileNumber*/)
const RenderData *rd = this->m_rd;
if (rd->mode & R_BORDER && rd->mode & R_CROP) {
/*!
When using cropped render result, need to re-position area of interest,
so it'll natch bounds of render border within frame. By default, canvas
will be centered between full frame and cropped frame, so we use such
scheme to map cropped coordinates to full-frame coordinates
^ Y
| Width
+------------------------------------------------+
| |
| |
| Centered canvas, we map coordinate from it |
| +------------------+ |
| | | | H
| | | | e
| +------------------+ . Center | | i
| | | | | | g
| | | | | | h
| |....dx.... +------|-----------+ | t
| | . dy | |
| +------------------+ |
| Render border, we map coordinates to it |
| | X
+------------------------------------------------+---->
Full frame
/**
* When using cropped render result, need to re-position area of interest,
* so it'll natch bounds of render border within frame. By default, canvas
* will be centered between full frame and cropped frame, so we use such
* scheme to map cropped coordinates to full-frame coordinates
*
* ^ Y
* | Width
* +------------------------------------------------+
* | |
* | |
* | Centered canvas, we map coordinate from it |
* | +------------------+ |
* | | | | H
* | | | | e
* | +------------------+ . Center | | i
* | | | | | | g
* | | | | | | h
* | |....dx.... +------|-----------+ | t
* | | . dy | |
* | +------------------+ |
* | Render border, we map coordinates to it |
* | | X
* +------------------------------------------------+---->
* Full frame
*/
int full_width = rd->xsch * rd->size / 100;

1
source/blender/editors/armature/editarmature_retarget.c
View File

@ -911,6 +911,7 @@ static void RIG_reconnectControlBones(RigGraph *rg)
/* if we haven't found one yet, look in control bones */
if (ctrl->tail_mode == TL_NONE) {
/* pass */
}
}
}

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

@ -2953,9 +2953,11 @@ void init_userdef_do_versions(void)
/**
* Include next version bump.
*
* (keep this block even if it becomes empty).
*/
{
/* (keep this block even if it becomes empty). */
}
if (((bTheme *)U.themes.first)->tui.manipulator_hi[3] == 0) {
for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
ui_theme_space_init_manipulator_colors(btheme);

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

@ -1961,7 +1961,7 @@ static KnifeEdge *knife_find_closest_edge(KnifeTool_OpData *kcd, float p[3], flo
/* check if we're close enough and calculate 'lambda' */
if (kcd->is_angle_snapping) {
/* if snapping, check we're in bounds */
/* if snapping, check we're in bounds */
float sco_snap[2];
isect_line_line_v2_point(kfe->v1->sco, kfe->v2->sco, kcd->prev.mval, kcd->curr.mval, sco_snap);
lambda = line_point_factor_v2(sco_snap, kfe->v1->sco, kfe->v2->sco);

44
source/blender/editors/physics/particle_edit.c
View File

@ -1357,28 +1357,28 @@ static void toggle_key_select(PEData *data, int point_index, int key_index)
static void select_action_apply(PTCacheEditPoint *point, PTCacheEditKey *key, int action)
{
switch (action) {
case SEL_SELECT:
if ((key->flag & PEK_SELECT) == 0) {
key->flag |= PEK_SELECT;
point->flag |= PEP_EDIT_RECALC;
}
break;
case SEL_DESELECT:
if (key->flag & PEK_SELECT) {
key->flag &= ~PEK_SELECT;
point->flag |= PEP_EDIT_RECALC;
}
break;
case SEL_INVERT:
if ((key->flag & PEK_SELECT) == 0) {
key->flag |= PEK_SELECT;
point->flag |= PEP_EDIT_RECALC;
}
else {
key->flag &= ~PEK_SELECT;
point->flag |= PEP_EDIT_RECALC;
}
break;
case SEL_SELECT:
if ((key->flag & PEK_SELECT) == 0) {
key->flag |= PEK_SELECT;
point->flag |= PEP_EDIT_RECALC;
}
break;
case SEL_DESELECT:
if (key->flag & PEK_SELECT) {
key->flag &= ~PEK_SELECT;
point->flag |= PEP_EDIT_RECALC;
}
break;
case SEL_INVERT:
if ((key->flag & PEK_SELECT) == 0) {
key->flag |= PEK_SELECT;
point->flag |= PEP_EDIT_RECALC;
}
else {
key->flag &= ~PEK_SELECT;
point->flag |= PEP_EDIT_RECALC;
}
break;
}
}

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

@ -1764,6 +1764,7 @@ static void area_split_cancel(bContext *C, wmOperator *op)
sAreaSplitData *sd = (sAreaSplitData *)op->customdata;
if (sd->previewmode) {
/* pass */
}
else {
if (screen_area_join(C, CTX_wm_screen(C), sd->sarea, sd->narea)) {

2
source/blender/editors/space_file/space_file.c
View File

@ -646,7 +646,7 @@ static void file_tools_region_listener(
#if 0
/* context changes */
switch (wmn->category) {
/* pass */
}
#endif
}

2
source/blender/editors/space_nla/nla_buttons.c
View File

@ -72,7 +72,7 @@ static void do_nla_region_buttons(bContext *C, void *UNUSED(arg), int UNUSED(eve
//Scene *scene = CTX_data_scene(C);
#if 0
switch (event) {
/* pass */
}
#endif
/* default for now */

2
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@ -1454,7 +1454,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
/* NOTE: sequencer mask editing isnt finished, the draw code is working but editing not,
* for now just disable drawing since the strip frame will likely be offset */
//if (sc->mode == SC_MODE_MASKEDIT) {
// if (sc->mode == SC_MODE_MASKEDIT)
if (0 && sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
Mask *mask = BKE_sequencer_mask_get(scene);

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

@ -5577,7 +5577,7 @@ static void slide_origdata_interp_data_vert(
project_plane_normalized_v3_v3v3(v_proj[1], sv->co_orig_3d, v_proj_axis);
}
// BM_ITER_ELEM (l, &liter, sv->v, BM_LOOPS_OF_VERT) {
// BM_ITER_ELEM (l, &liter, sv->v, BM_LOOPS_OF_VERT)
BM_iter_init(&liter, bm, BM_LOOPS_OF_VERT, sv->v);
l_num = liter.count;
loop_weights = do_loop_weight ? BLI_array_alloca(loop_weights, l_num) : NULL;

2
source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h
View File

@ -275,7 +275,7 @@ protected:
{
if (_Point != 0) {
delete _Point;
_Point = 0;
_Point = 0;
}
if ((_currentn == _n - 1) && (_t == 1.0f)) {
// we're setting the iterator to end

6
source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
View File

@ -555,9 +555,9 @@ public:
// operators
// operator corresponding to ++i.
inline Self& operator++()
{
increment();
return *this;
{
increment();
return *this;
}
// operator corresponding to i++, i.e. which returns the value *and then* increments it.

2
source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
View File

@ -113,7 +113,7 @@ public:
#endif
inline void setRenderMonitor(RenderMonitor *iRenderMonitor) {
_pRenderMonitor = iRenderMonitor;
_pRenderMonitor = iRenderMonitor;
}
protected:

13
source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
View File

@ -704,11 +704,12 @@ void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask
{
// Make sure the masks are correct.
if ((rmask & gmask) ||
(rmask & bmask) ||
(rmask & amask) ||
(gmask & bmask) ||
(gmask & amask) ||
(bmask & amask)) {
(rmask & bmask) ||
(rmask & amask) ||
(gmask & bmask) ||
(gmask & amask) ||
(bmask & amask))
{
printf("DDS: bad RGBA masks, pixel format not set\n");
return;
}
@ -1068,7 +1069,7 @@ bool DirectDrawSurface::isTexture3D() const
}
else
{
return (header.caps.caps2 & DDSCAPS2_VOLUME) != 0;
return (header.caps.caps2 & DDSCAPS2_VOLUME) != 0;
}
}

2
source/blender/imbuf/intern/jp2.c
View File

@ -119,7 +119,7 @@ static void info_callback(const char *msg, void *client_data)
# define PIXEL_LOOPER_END \
} \
} (void)0 \
} (void)0 \
struct ImBuf *imb_jp2_decode(const unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE])
{

2
source/blender/makesrna/intern/rna_material.c
View File

@ -376,7 +376,7 @@ static const EnumPropertyItem *rna_Material_texture_coordinates_itemf(bContext *
RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_ORCO);
if (ma->material_type == MA_TYPE_VOLUME) {
/* pass */
}
else if (ELEM(ma->material_type, MA_TYPE_SURFACE, MA_TYPE_HALO, MA_TYPE_WIRE)) {
RNA_enum_items_add_value(&item, &totitem, prop_texture_coordinates_items, TEXCO_UV);

2
source/blender/makesrna/intern/rna_mesh_utils.h
View File

@ -85,7 +85,7 @@
} \
else { \
layer = NULL; \
} \
} \
return rna_pointer_inherit_refine(ptr, &RNA_##layer_rna_type, layer); \
} \
\

24
source/blender/render/intern/source/shadeoutput.c
View File

@ -970,18 +970,18 @@ static void add_to_diffuse(float diff[3], const ShadeInput *shi, const float is,
/* input */
switch (ma->rampin_col) {
case MA_RAMP_IN_ENERGY:
fac = IMB_colormanagement_get_luminance(rgb);
break;
case MA_RAMP_IN_SHADER:
fac = is;
break;
case MA_RAMP_IN_NOR:
fac = dot_v3v3(shi->view, shi->vn);
break;
default:
fac = 0.0f;
break;
case MA_RAMP_IN_ENERGY:
fac = IMB_colormanagement_get_luminance(rgb);
break;
case MA_RAMP_IN_SHADER:
fac = is;
break;
case MA_RAMP_IN_NOR:
fac = dot_v3v3(shi->view, shi->vn);
break;
default:
fac = 0.0f;
break;
}
BKE_colorband_evaluate(ma->ramp_col, fac, col);