Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-03 08:50:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-03 08:50:50 +0300
commitffdc1f892445aa7949917523d0f0f30fa73815fe (patch)
treea2408ce46b574e2e219a57a4de2327a9d1ab047a /source/blender
parent81c2fd25e5be3781285298e1ded16fb591da24e0 (diff)
Cleanup: warning, style
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/draw/intern/draw_manager.c2
-rw-r--r--source/blender/editors/gpencil/gpencil_primitive.c3
-rw-r--r--source/blender/editors/render/render_shading.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 5faf7cf8f59..41acc9fe03c 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -192,7 +192,7 @@ bool DRW_object_is_flat_normal(const Object *ob)
bool DRW_object_use_hide_faces(const struct Object *ob)
{
if (ob->type == OB_MESH) {
- const Mesh *me = DEG_get_original_object((Object*)ob)->data;
+ const Mesh *me = DEG_get_original_object((Object *)ob)->data;
switch (ob->mode) {
case OB_MODE_TEXTURE_PAINT:
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index ebd1f36b511..336ed305a93 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -594,7 +594,8 @@ static void gpencil_primitive_interaction_end(bContext *C, wmOperator *op, wmWin
}
/* Helper to square a primitive */
-static void gpencil_primitive_to_square(tGPDprimitive *tgpi, const int x, const int y) {
+static void gpencil_primitive_to_square(tGPDprimitive *tgpi, const int x, const int y)
+{
int w = abs(x);
int h = abs(y);
if ((x > 0 && y > 0) || (x < 0 && y < 0)) {
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index 8ef324d1526..3cbbcdbf740 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -103,7 +103,7 @@
* Object list for material operations.
* has exception for pinned object.
*/
-Object **object_array_for_shading(bContext *C, uint *r_objects_len)
+static Object **object_array_for_shading(bContext *C, uint *r_objects_len)
{
ScrArea *sa = CTX_wm_area(C);
SpaceButs *sbuts = NULL;