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

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton 2015-09-02 18:39:19 +10:00
parent 41b99e40c0
commit 5fe9b36aa6
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -3667,7 +3667,7 @@ static void project_paint_prepare_all_faces(
/* backface culls individual triangles but mask normal will use polygon */
if (ps->do_backfacecull) {
if (ps->do_mask_normal) {
if (prev_poly != lt->poly) {\
if (prev_poly != lt->poly) {
int iloop;
bool culled = true;
const MPoly *poly = ps->dm_mpoly + lt->poly;

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

@ -230,10 +230,12 @@ static void node_shader_exec_math(void *UNUSED(data), int UNUSED(thread), bNode
static int gpu_shader_math(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
{
static const char *names[] = {"math_add", "math_subtract", "math_multiply",
static const char *names[] = {
"math_add", "math_subtract", "math_multiply",
"math_divide", "math_sine", "math_cosine", "math_tangent", "math_asin",
"math_acos", "math_atan", "math_pow", "math_log", "math_min", "math_max",
"math_round", "math_less_than", "math_greater_than", "math_modulo", "math_abs"};
"math_round", "math_less_than", "math_greater_than", "math_modulo", "math_abs",
};
switch (node->custom1) {
case NODE_MATH_ADD:

3
source/gameengine/Ketsji/KX_SteeringActuator.cpp
View File

@ -610,8 +610,7 @@ int KX_SteeringActuator::pyattr_set_navmesh(void *self, const struct KX_PYATTRIB
if (!ConvertPythonToGameObject(value, &gameobj, true, "actuator.object = value: KX_SteeringActuator"))
return PY_SET_ATTR_FAIL; // ConvertPythonToGameObject sets the error
if (dynamic_cast<KX_NavMeshObject *>(gameobj) == NULL)
{
if (dynamic_cast<KX_NavMeshObject *>(gameobj) == NULL) {
PyErr_Format(PyExc_TypeError, "KX_NavMeshObject is expected");
return PY_SET_ATTR_FAIL;
}