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

Code Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton 2014-01-09 11:44:14 +11:00
parent 8c0f9365c0
commit e47a41e3fc
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/tracking_private.h
View File

@ -32,8 +32,8 @@
* by multiple tracking files but which should not be public. * by multiple tracking files but which should not be public.
*/ */
#ifndef __BKE_TRACKING_PRIVATE__ #ifndef __TRACKING_PRIVATE__
#define __BKE_TRACKING_PRIVATE__ #define __TRACKING_PRIVATE__
struct GHash; struct GHash;
struct MovieTracking; struct MovieTracking;
@ -81,4 +81,4 @@ void tracking_set_marker_coords_from_tracking(int frame_width, int frame_height,
void tracking_marker_insert_disabled(struct MovieTrackingTrack *track, const struct MovieTrackingMarker *ref_marker, void tracking_marker_insert_disabled(struct MovieTrackingTrack *track, const struct MovieTrackingMarker *ref_marker,
bool before, bool overwrite); bool before, bool overwrite);
#endif /* __BKE_TRACKING_PRIVATE__ */ #endif /* __TRACKING_PRIVATE__ */

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

@ -2437,8 +2437,10 @@ static bool tri_corner_test(BevelParams *bp, BevVert *bv)
} }
angdiff = fabsf(totang - 3.0f * (float)M_PI_2); angdiff = fabsf(totang - 3.0f * (float)M_PI_2);
if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI/16.0f) || if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI/16.0f) ||
angdiff > (float)M_PI_4) (angdiff > (float)M_PI_4))
{
return false; return false;
}
return true; return true;
} }

2
source/blender/compositor/intern/COM_ExecutionGroup.cpp
View File

@ -647,7 +647,7 @@ void ExecutionGroup::setRenderBorder(float xmin, float xmax, float ymin, float y
NodeOperation *operation = this->getOutputNodeOperation(); NodeOperation *operation = this->getOutputNodeOperation();
if (operation->isOutputOperation(true)) { if (operation->isOutputOperation(true)) {
/* Basically, setting border need to happen for only operatoins /* Basically, setting border need to happen for only operations
* which operates in render resolution buffers (like compositor * which operates in render resolution buffers (like compositor
* output nodes). * output nodes).
* *

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

@ -176,7 +176,7 @@ static int mesh_bisect_modal(bContext *C, wmOperator *op, const wmEvent *event)
/* update or clear modal callout */ /* update or clear modal callout */
if (event->type == EVT_MODAL_MAP) { if (event->type == EVT_MODAL_MAP) {
if(event->val == GESTURE_MODAL_BEGIN) { if (event->val == GESTURE_MODAL_BEGIN) {
ED_area_headerprint(CTX_wm_area(C), IFACE_("LMB: Release to confirm cut line")); ED_area_headerprint(CTX_wm_area(C), IFACE_("LMB: Release to confirm cut line"));
} }
else { else {

2
source/blender/editors/object/object_warp.c
View File

@ -192,7 +192,7 @@ static int object_warp_verts_exec(bContext *C, wmOperator *op)
ED_transverts_create_from_obedit(&tvs, obedit, TM_ALL_JOINTS | TM_SKIP_HANDLES); ED_transverts_create_from_obedit(&tvs, obedit, TM_ALL_JOINTS | TM_SKIP_HANDLES);
if (tvs.transverts == 0) { if (tvs.transverts == NULL) {
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }

5
source/blender/makesrna/intern/rna_rigidbody.c
View File

@ -76,13 +76,14 @@ EnumPropertyItem rigidbody_constraint_type_items[] = {
{RBC_TYPE_MOTOR, "MOTOR", ICON_NONE, "Motor", "Drive rigid body around or along an axis"}, {RBC_TYPE_MOTOR, "MOTOR", ICON_NONE, "Motor", "Drive rigid body around or along an axis"},
{0, NULL, 0, NULL, NULL}}; {0, NULL, 0, NULL, NULL}};
#ifndef RNA_RUNTIME
/* mesh source for collision shape creation */ /* mesh source for collision shape creation */
EnumPropertyItem rigidbody_mesh_source_items[] = { static EnumPropertyItem rigidbody_mesh_source_items[] = {
{RBO_MESH_BASE, "BASE", 0, "Base", "Base mesh"}, {RBO_MESH_BASE, "BASE", 0, "Base", "Base mesh"},
{RBO_MESH_DEFORM, "DEFORM", 0, "Deform", "Deformations (shaps keys, deform modifiers"}, {RBO_MESH_DEFORM, "DEFORM", 0, "Deform", "Deformations (shaps keys, deform modifiers"},
{RBO_MESH_FINAL, "FINAL", 0, "Final", "All modifiers"}, {RBO_MESH_FINAL, "FINAL", 0, "Final", "All modifiers"},
{0, NULL, 0, NULL, NULL}}; {0, NULL, 0, NULL, NULL}};
#endif
#ifdef RNA_RUNTIME #ifdef RNA_RUNTIME