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:
-rw-r--r--source/blender/blenkernel/intern/multires_inline.h6
-rw-r--r--source/blender/blenkernel/intern/subdiv_inline.h6
-rw-r--r--source/blender/editors/gpencil/gpencil_paint.c2
-rw-r--r--source/blender/windowmanager/intern/wm_files.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/multires_inline.h b/source/blender/blenkernel/intern/multires_inline.h
index fe01fb6e221..99b4695fe46 100644
--- a/source/blender/blenkernel/intern/multires_inline.h
+++ b/source/blender/blenkernel/intern/multires_inline.h
@@ -27,8 +27,8 @@
* \ingroup bke
*/
-#ifndef __BKE_MULTIRES_INLINE_H__
-#define __BKE_MULTIRES_INLINE_H__
+#ifndef __MULTIRES_INLINE_H__
+#define __MULTIRES_INLINE_H__
#include "BKE_multires.h"
#include "BLI_math_vector.h"
@@ -65,4 +65,4 @@ BLI_INLINE void BKE_multires_construct_tangent_matrix(
normalize_v3(tangent_matrix[2]);
}
-#endif /* __BKE_MULTIRES_INLINE_H__ */
+#endif /* __MULTIRES_INLINE_H__ */
diff --git a/source/blender/blenkernel/intern/subdiv_inline.h b/source/blender/blenkernel/intern/subdiv_inline.h
index 0e715506ed3..4dc300e8577 100644
--- a/source/blender/blenkernel/intern/subdiv_inline.h
+++ b/source/blender/blenkernel/intern/subdiv_inline.h
@@ -27,8 +27,8 @@
* \ingroup bke
*/
-#ifndef __BKE_SUBDIV_INLINE_H__
-#define __BKE_SUBDIV_INLINE_H__
+#ifndef __SUBDIV_INLINE_H__
+#define __SUBDIV_INLINE_H__
#include "BKE_subdiv.h"
#include "BLI_utildefines.h"
@@ -75,4 +75,4 @@ BLI_INLINE int BKE_subdiv_rotate_quad_to_corner(
return corner;
}
-#endif /* __BKE_SUBDIV_INLINE_H__ */
+#endif /* __SUBDIV_INLINE_H__ */
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 44d47d1354b..e734542eb43 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1041,7 +1041,7 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
}
else {
if ((ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_ENDPOINTS) ||
- (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_FIRST))
+ (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE_FIRST))
{
int first_valid = 0;
int last_valid = 0;
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 05f139858a5..6212b096f3d 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -2380,8 +2380,8 @@ static uiBlock *block_create_autorun_warning(struct bContext *C, struct ARegion
/* Allow reload if we have a saved file. */
if (G.relbase_valid) {
but = uiDefIconTextBut(
- block, UI_BTYPE_BUT, 0, ICON_NONE, IFACE_("Allow Executon"), 0, 0, 50, UI_UNIT_Y,
- NULL, 0, 0, 0, 0, TIP_("Reload file with execution of Python scripts enabled"));
+ block, UI_BTYPE_BUT, 0, ICON_NONE, IFACE_("Allow Executon"), 0, 0, 50, UI_UNIT_Y,
+ NULL, 0, 0, 0, 0, TIP_("Reload file with execution of Python scripts enabled"));
UI_but_func_set(but, wm_block_autorun_warning_allow, block, NULL);
}
else {