[Bf-blender-cvs] [158f799a961] master: Cleanup: warnings, formatting
Campbell Barton
noreply at git.blender.org
Sat Jun 22 02:12:13 CEST 2019
Commit: 158f799a961aef18c1a2890ec240dd8864fc7eb3
Author: Campbell Barton
Date: Sat Jun 22 10:10:13 2019 +1000
Branches: master
https://developer.blender.org/rB158f799a961aef18c1a2890ec240dd8864fc7eb3
Cleanup: warnings, formatting
===================================================================
M intern/cycles/util/util_windows.cpp
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/space_view3d/view3d_select.c
===================================================================
diff --git a/intern/cycles/util/util_windows.cpp b/intern/cycles/util/util_windows.cpp
index b8de9c418fe..807a5adc84a 100644
--- a/intern/cycles/util/util_windows.cpp
+++ b/intern/cycles/util/util_windows.cpp
@@ -15,7 +15,7 @@
*/
#ifdef _WIN32
-#include <windows.h>
+# include <windows.h>
#endif
#include "util_windows.h"
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 99843c66d0e..93268456277 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -519,7 +519,7 @@ struct EDSelectID_Context *ED_view3d_select_id_context_create(struct ViewContext
short select_mode);
void ED_view3d_select_id_context_destroy(struct EDSelectID_Context *sel_id_ctx);
-void ED_view3d_select_id_validate_view_matrices(const struct EDSelectID_Context *sel_id_ctx,
+void ED_view3d_select_id_validate_view_matrices(struct EDSelectID_Context *sel_id_ctx,
struct ViewContext *vc);
uint ED_view3d_select_id_context_offset_for_object_elem(
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index a694a8e7305..3ff97cdd59a 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -194,7 +194,7 @@ static void ed_select_id_draw_bases(struct EDSelectID_Context *sel_id_ctx,
DRW_framebuffer_select_id_release(vc->ar);
}
-void ED_view3d_select_id_validate_view_matrices(const struct EDSelectID_Context *sel_id_ctx,
+void ED_view3d_select_id_validate_view_matrices(struct EDSelectID_Context *sel_id_ctx,
ViewContext *vc)
{
if (!compare_m4m4(sel_id_ctx->persmat, vc->rv3d->persmat, FLT_EPSILON)) {
More information about the Bf-blender-cvs
mailing list