[Bf-blender-cvs] [fa69ce9e3a6] blender2.8: Cleanup: whitespace, duplicate includes
Campbell Barton
noreply at git.blender.org
Tue May 8 16:57:58 CEST 2018
Commit: fa69ce9e3a682426aa0d247f4720571889d5a6c2
Author: Campbell Barton
Date: Tue May 8 16:57:07 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfa69ce9e3a682426aa0d247f4720571889d5a6c2
Cleanup: whitespace, duplicate includes
===================================================================
M source/blender/blenkernel/BKE_armature.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/draw/engines/workbench/workbench_studiolight.c
M source/blender/draw/intern/draw_common.h
M source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
M source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
M source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
M source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
M source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
M source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
M source/blender/editors/mesh/editmesh_extrude_screw.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/screen/area.c
M source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c
M source/blender/editors/transform/transform_manipulator_3d.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_util.c
M source/blender/modifiers/intern/MOD_weightvgedit.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/windowmanager/intern/wm_draw.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index b8d9e5a9af9..57d70afcb8b 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -176,55 +176,64 @@ struct bPose;
struct bSplineIKConstraint;
struct bPoseChannel *BKE_armature_ik_solver_find_root(
- struct bPoseChannel *pchan,
- struct bKinematicConstraint *data);
+ struct bPoseChannel *pchan,
+ struct bKinematicConstraint *data);
struct bPoseChannel *BKE_armature_splineik_solver_find_root(
- struct bPoseChannel *pchan,
- struct bSplineIKConstraint *data);
+ struct bPoseChannel *pchan,
+ struct bSplineIKConstraint *data);
void BKE_pose_splineik_init_tree(struct Scene *scene, struct Object *ob, float ctime);
void BKE_splineik_execute_tree(
- struct Depsgraph *depsgraph, struct Scene *scene,
- struct Object *ob, struct bPoseChannel *pchan_root, float ctime);
-
-void BKE_pose_eval_init(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob);
-
-void BKE_pose_eval_init_ik(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob);
-
-void BKE_pose_eval_bone(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob,
- int pchan_index);
-
-void BKE_pose_constraints_evaluate(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob,
- int pchan_index);
-
-void BKE_pose_bone_done(struct Depsgraph *depsgraph,
- struct Object *ob,
- int pchan_index);
-
-void BKE_pose_iktree_evaluate(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob,
- int rootchan_index);
-
-void BKE_pose_splineik_evaluate(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob,
- int rootchan_index);
-
-void BKE_pose_eval_flush(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob);
-
-void BKE_pose_eval_proxy_copy(struct Depsgraph *depsgraph,
- struct Object *ob);
+ struct Depsgraph *depsgraph, struct Scene *scene,
+ struct Object *ob, struct bPoseChannel *pchan_root, float ctime);
+
+void BKE_pose_eval_init(
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *ob);
+
+void BKE_pose_eval_init_ik(
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *ob);
+
+void BKE_pose_eval_bone(
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *ob,
+ int pchan_index);
+
+void BKE_pose_constraints_evaluate(
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *ob,
+ int pchan_index);
+
+void BKE_pose_bone_done(
+ struct Depsgraph *depsgraph,
+ struct Object *ob,
+ int pchan_index);
+
+void BKE_pose_iktree_evaluate(
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *ob,
+ int rootchan_index);
+
+void BKE_pose_splineik_evaluate(
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *ob,
+ int rootchan_index);
+
+void BKE_pose_eval_flush(
+ struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct Object *ob);
+
+void BKE_pose_eval_proxy_copy(
+ struct Depsgraph *depsgraph,
+ struct Object *ob);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 6e10bc71cb5..cce637aa4ba 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -101,7 +101,7 @@ struct Mesh *BKE_mesh_copy(struct Main *bmain, const struct Mesh *me);
void BKE_mesh_update_customdata_pointers(struct Mesh *me, const bool do_ensure_tess_cd);
void BKE_mesh_ensure_skin_customdata(struct Mesh *me);
-struct Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces,int numLoops, int numPolys);
+struct Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys);
struct Mesh *BKE_mesh_from_template(
const struct Mesh *me_src,
int numVerts, int numEdges, int numTessFaces,
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index fd66b8faf77..4fe2c3bf1ec 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -51,7 +51,6 @@
#include "BKE_main.h"
#include "BKE_DerivedMesh.h"
#include "BKE_global.h"
-#include "BKE_idcode.h"
#include "BKE_mesh.h"
#include "BKE_mesh_mapping.h"
#include "BKE_displist.h"
@@ -615,13 +614,14 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int
}
}
-Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces,int numLoops, int numPolys)
+Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys)
{
- Mesh *mesh = BKE_libblock_alloc(NULL, ID_ME,
- BKE_idcode_to_name(ID_ME),
- LIB_ID_CREATE_NO_MAIN |
- LIB_ID_CREATE_NO_USER_REFCOUNT |
- LIB_ID_CREATE_NO_DEG_TAG);
+ Mesh *mesh = BKE_libblock_alloc(
+ NULL, ID_ME,
+ BKE_idcode_to_name(ID_ME),
+ LIB_ID_CREATE_NO_MAIN |
+ LIB_ID_CREATE_NO_USER_REFCOUNT |
+ LIB_ID_CREATE_NO_DEG_TAG);
BKE_libblock_init_empty(&mesh->id);
/* don't use CustomData_reset(...); because we dont want to touch customdata */
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 54e5848c2e6..8049c23c439 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -962,7 +962,7 @@ struct Mesh *modifier_applyModifier(struct ModifierData *md, const ModifierEvalC
DerivedMesh *ndm = mti->applyModifier_DM(md, ctx, dm);
- if(ndm != dm) {
+ if (ndm != dm) {
dm->release(dm);
}
@@ -986,7 +986,7 @@ struct Mesh *modifier_applyModifierEM(struct ModifierData *md, const ModifierEva
DerivedMesh *ndm = mti->applyModifierEM_DM(md, ctx, editData, dm);
- if(ndm != dm) {
+ if (ndm != dm) {
dm->release(dm);
}
@@ -1120,7 +1120,7 @@ struct DerivedMesh *modifier_applyModifier_DM_deprecated(struct ModifierData *md
/* Make a DM that doesn't reference new_mesh so we can free the latter. */
DerivedMesh *ndm = CDDM_from_mesh_ex(new_mesh, CD_DUPLICATE);
- if(new_mesh != mesh) {
+ if (new_mesh != mesh) {
BKE_id_free(NULL, new_mesh);
}
if (mesh != NULL) {
@@ -1153,7 +1153,7 @@ struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(struct ModifierData *
/* Make a DM that doesn't reference new_mesh so we can free the latter. */
DerivedMesh *ndm = CDDM_from_mesh_ex(new_mesh, CD_DUPLICATE);
- if(new_mesh != mesh) {
+ if (new_mesh != mesh) {
BKE_id_free(NULL, new_mesh);
}
if (mesh != NULL) {
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index 0c0c006d5a9..8011ed62bff 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -96,7 +96,7 @@ static char *workbench_build_defines(WORKBENCH_PrivateData *wpd, int drawtype)
if (wpd->shading.light & V3D_LIGHTING_STUDIO) {
BLI_dynstr_appendf(ds, "#define V3D_LIGHTING_STUDIO\n");
}
- switch(drawtype) {
+ switch (drawtype) {
case OB_SOLID:
BLI_dynstr_appendf(ds, "#define OB_SOLID\n");
break;
@@ -165,7 +165,8 @@ static int get_shader_index(WORKBENCH_PrivateData *wpd, int drawtype)
return index;
}
-static void ensure_deferred_shaders(WORKBENCH_PrivateData *wpd, int index, int drawtype) {
+static void ensure_deferred_shaders(WORKBENCH_PrivateData *wpd, int index, int drawtype)
+{
if (e_data.prepass_sh_cache[index] == NULL) {
char *defines = workbench_build_defines(wpd, drawtype);
char *composite_frag = workbench_build_composite_frag(wpd);
@@ -434,7 +435,7 @@ static WORKBENCH_MaterialData *get_or_create_material_data(WORKBENCH_Data *vedat
DRW_shgroup_stencil_mask(material->shgrp, 0xFF);
material->object_id = engine_object_data->object_id;
copy_v3_v3(material->color, material_template.color);
- switch(drawtype) {
+ switch (drawtype) {
case OB_SOLID:
DRW_shgroup_uniform_vec3(material->shgrp, "object_color", material->color, 1);
break;
@@ -503,8 +504,7 @@ void workbench_materials_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob
const bool is_sculpt_mode = is_active && (draw_ctx->object_mode & OB_MODE_SCULPT) != 0;
const bool is_edit_mode = is_active && (draw_ctx->object_mode & OB_MODE_EDIT) != 0;
bool is_drawn = false;
- if (!is_edit_mode && !is_sculpt_mode && wpd->drawtype == OB_TEXTURE && ob->type == OB_MESH)
- {
+ if (!is_edit_mode && !is_sculpt_mode && wpd->drawtype == OB_TEXTURE && ob->type == OB_MESH) {
const Mesh *me = ob->data;
if (me->mloopuv) {
const int materials_len = MAX2(1, (is_sculpt_mode ? 1 : ob->totcol));
diff --git a/source/blender/draw/engines/workbench/workbench_studiolight.c b/source/blender/draw/engines/workbench/workbench_studiolight.c
index bb75d12f10f..09cfc2608d2 100644
--- a/source/blender/draw/engines/workbench/workbench_studiolight.c
+++ b/source/blender/draw/engines/workbench/workbench_studiolight.c
@@ -19,10 +19,10 @@
*
*/
-/** \file workbench_studiolight.h
+/** \file workbench_studiolight.c
* \ingroup draw_engine
*/
- #include "DRW_engine.h"
+#include "DRW_engine.h"
#include "workbench_private.h"
#include "BLI_math.h"
@@ -78,7 +78,8 @@ const float studiolights[][6][3] = {
},
};
-void studiolight_update_world(int studio_light, WORKBENCH_UBO_World* wd) {
+void studiolight_update_world(int studio_light, WORKBENCH_UBO_World *wd)
+{
copy_v3_v3(wd->diffuse_light_x_pos, studiolights[studio_light][STUDIOLIGHT_X_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list