Commit: ffdc1f892445aa7949917523d0f0f30fa73815fe
Author: Campbell Barton
Date: Mon Dec 3 16:50:50 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBffdc1f892445aa7949917523d0f0f30fa73815fe
Cleanup: warning, style
===================================================================
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/gpencil/gpencil_primitive.c
M source/blender/editors/render/render_shading.c
===================================================================
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
