blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2020-04-01 18:54:34 +11:00
parent 60ff3a7daf
commit 186ac84210
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4473,12 +4473,14 @@ void BKE_fluid_particle_system_destroy(struct Object *ob, const int particle_typ
void BKE_fluid_cache_startframe_set(FluidDomainSettings *settings, int value)
{
settings->cache_frame_start = (value > settings->cache_frame_end) ? settings->cache_frame_end : value;
settings->cache_frame_start = (value > settings->cache_frame_end) ? settings->cache_frame_end :
value;
}
void BKE_fluid_cache_endframe_set(FluidDomainSettings *settings, int value)
{
settings->cache_frame_end = (value < settings->cache_frame_start) ? settings->cache_frame_start : value;
settings->cache_frame_end = (value < settings->cache_frame_start) ? settings->cache_frame_start :
value;
}
void BKE_fluid_cachetype_mesh_set(FluidDomainSettings *settings, int cache_mesh_format)

4
source/blender/editors/screen/screen_context.c
View File

@ -89,7 +89,7 @@ const char *screen_context_dir[] = {
"sequences",
"selected_sequences",
"selected_editable_sequences", /* sequencer */
"selected_nla_strips", /* nla editor */
"selected_nla_strips", /* nla editor */
"gpencil_data",
"gpencil_data_owner", /* grease pencil data */
"annotation_data",
@ -506,7 +506,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
}
}
else if (CTX_data_equals(member, "selected_nla_strips")) {
bAnimContext ac;
bAnimContext ac;
if (ANIM_animdata_get_context(C, &ac) != 0) {
ListBase anim_data = {NULL, NULL};
bAnimListElem *ale;

4
source/blender/makesrna/intern/rna_brush.c
View File

@ -1346,7 +1346,9 @@ static void rna_def_gpencil_options(BlenderRNA *brna)
RNA_def_property_range(prop, 0.001f, 1.0f);
RNA_def_property_float_default(prop, 1.0f);
RNA_def_property_ui_text(
prop, "Hardness", "Gradient from the center of Dot and Box strokes (set to 1 for a solid stroke)");
prop,
"Hardness",
"Gradient from the center of Dot and Box strokes (set to 1 for a solid stroke)");
RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
/* gradient shape ratio */

11
source/blender/modifiers/intern/MOD_warp.c
View File

@ -30,9 +30,9 @@
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "BKE_action.h" /* BKE_pose_channel_find_name */
#include "BKE_colortools.h"
#include "BKE_deform.h"
#include "BKE_action.h" /* BKE_pose_channel_find_name */
#include "BKE_editmesh.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
@ -86,7 +86,10 @@ static void requiredDataMask(Object *UNUSED(ob),
}
}
static void matrix_from_obj_pchan(float mat[4][4], float obinv[4][4], Object *ob, const char *bonename)
static void matrix_from_obj_pchan(float mat[4][4],
const float obinv[4][4],
Object *ob,
const char *bonename)
{
bPoseChannel *pchan = BKE_pose_channel_find_name(ob->pose, bonename);
if (pchan) {
@ -150,8 +153,8 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
}
static void warp_deps_object_bone_new(struct DepsNodeHandle *node,
Object *object,
const char *bonename)
Object *object,
const char *bonename)
{
if (bonename[0] && object->type == OB_ARMATURE) {
DEG_add_object_relation(node, object, DEG_OB_COMP_EVAL_POSE, "Warp Modifier");