diff options
25 files changed, 31 insertions, 32 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 899da59324f..89c55d8b04f 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -766,4 +766,3 @@ if(WITH_POTRACE) set(POTRACE_LIBRARIES ${LIBDIR}/potrace/lib/potrace.lib) set(POTRACE_FOUND On) endif() - diff --git a/doc/python_api/rst/info_gotcha.rst b/doc/python_api/rst/info_gotcha.rst index eb5cc143a2c..e5ff56063b5 100644 --- a/doc/python_api/rst/info_gotcha.rst +++ b/doc/python_api/rst/info_gotcha.rst @@ -677,7 +677,7 @@ Here are some general hints to avoid running into these problems: Undo/Redo --------- -For safety, you should assume that undo and redo always invalidates all :class:`bpy.types.ID` +For safety, you should assume that undo and redo always invalidates all :class:`bpy.types.ID` instances (Object, Scene, Mesh, Light, etc.), as weel obviously as all of their sub-data. This example shows how you can tell undo changes the memory locations: @@ -701,7 +701,7 @@ interactively by the user is the only way to make sure that the script doesn't b Modern undo/redo system does not systematically invalidate all pointers anymore. Some data (in fact, most data, in typical cases), which were detected as unchanged for a particular history step, may remain unchanged and hence their pointers may remain valid. - + Be aware that if you want to take advantage of this behavior for some reason, there is no guarantee of any kind that it will be safe and consistent. Use it at your own risk. diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index c601dec87a9..c4c9660c798 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -663,7 +663,7 @@ def brush_settings(layout, context, brush, popover=False): if brush.cloth_simulation_area_type != 'GLOBAL': layout.prop(brush, "cloth_sim_limit") layout.prop(brush, "cloth_sim_falloff") - + if brush.cloth_simulation_area_type == 'LOCAL': layout.prop(brush, "use_cloth_pin_simulation_boundary") diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 8bf7430d067..82c5bd311a2 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -1385,7 +1385,7 @@ class PHYSICS_PT_viewport_display_debug(PhysicButtonsPanel, Panel): if not domain.use_guide and domain.vector_field == 'GUIDE_VELOCITY': note = layout.split() note.label(icon='INFO', text="Enable Guides first! Defaulting to Fluid Velocity") - + if domain.vector_display_type == 'MAC': sub = col.column(heading="MAC Grid") sub.prop(domain, "vector_show_mac_x") @@ -1393,7 +1393,7 @@ class PHYSICS_PT_viewport_display_debug(PhysicButtonsPanel, Panel): sub.prop(domain, "vector_show_mac_z") else: col.prop(domain, "vector_scale_with_magnitude") - + col.prop(domain, "vector_field") col.prop(domain, "vector_scale") diff --git a/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc b/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc index b212ddb8e63..e503ef8f264 100644 --- a/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc +++ b/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc @@ -880,12 +880,12 @@ TEST(boolean_polymesh, CubePlane) 1 -1 1 1 1 -1 1 1 1 - 0 1 3 2 - 4 5 7 6 - 6 7 11 10 - 10 11 9 8 - 8 9 5 4 - 6 10 8 4 + 0 1 3 2 + 4 5 7 6 + 6 7 11 10 + 10 11 9 8 + 8 9 5 4 + 6 10 8 4 11 7 5 9 )"; diff --git a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl index b81fdd2c712..f7792dc0371 100644 --- a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl @@ -74,4 +74,4 @@ void main() final_color.a *= alpha; fragColor = final_color; -}
\ No newline at end of file +} diff --git a/source/blender/draw/tests/shaders_test.cc b/source/blender/draw/tests/shaders_test.cc index db0d9f46365..9ca15d412e0 100644 --- a/source/blender/draw/tests/shaders_test.cc +++ b/source/blender/draw/tests/shaders_test.cc @@ -358,4 +358,4 @@ TEST_F(DrawTest, eevee_glsl_shaders_static) EEVEE_shaders_free(); } -} // namespace blender::draw
\ No newline at end of file +} // namespace blender::draw diff --git a/source/blender/gpu/GPU_debug.h b/source/blender/gpu/GPU_debug.h index 8e8d889b387..f67e850ad80 100644 --- a/source/blender/gpu/GPU_debug.h +++ b/source/blender/gpu/GPU_debug.h @@ -38,4 +38,4 @@ bool GPU_debug_group_match(const char *ref); #ifdef __cplusplus } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/gpu/intern/gpu_context_private.hh b/source/blender/gpu/intern/gpu_context_private.hh index bf34f20afe4..ffa7a38faa6 100644 --- a/source/blender/gpu/intern/gpu_context_private.hh +++ b/source/blender/gpu/intern/gpu_context_private.hh @@ -107,4 +107,4 @@ static inline const Context *unwrap(const GPUContext *ctx) return reinterpret_cast<const Context *>(ctx); } -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/intern/gpu_debug_private.hh b/source/blender/gpu/intern/gpu_debug_private.hh index 1887e7c698a..11542a82dcb 100644 --- a/source/blender/gpu/intern/gpu_debug_private.hh +++ b/source/blender/gpu/intern/gpu_debug_private.hh @@ -32,4 +32,4 @@ namespace blender::gpu { typedef Vector<StringRef> DebugStack; -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/intern/gpu_immediate_private.hh b/source/blender/gpu/intern/gpu_immediate_private.hh index b867a85bb8b..e6c11120d7e 100644 --- a/source/blender/gpu/intern/gpu_immediate_private.hh +++ b/source/blender/gpu/intern/gpu_immediate_private.hh @@ -75,4 +75,4 @@ class Immediate { } // namespace blender::gpu void immActivate(void); -void immDeactivate(void);
\ No newline at end of file +void immDeactivate(void); diff --git a/source/blender/gpu/intern/gpu_platform.cc b/source/blender/gpu/intern/gpu_platform.cc index e4db8c93f1d..ad7142878e7 100644 --- a/source/blender/gpu/intern/gpu_platform.cc +++ b/source/blender/gpu/intern/gpu_platform.cc @@ -115,4 +115,4 @@ bool GPU_type_matches(eGPUDeviceType device, eGPUOSType os, eGPUDriverType drive return (GPG.device & device) && (GPG.os & os) && (GPG.driver & driver); } -/** \} */
\ No newline at end of file +/** \} */ diff --git a/source/blender/gpu/intern/gpu_platform_private.hh b/source/blender/gpu/intern/gpu_platform_private.hh index e882672fdda..02d99efa4a9 100644 --- a/source/blender/gpu/intern/gpu_platform_private.hh +++ b/source/blender/gpu/intern/gpu_platform_private.hh @@ -50,4 +50,4 @@ class GPUPlatformGlobal { extern GPUPlatformGlobal GPG; -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/intern/gpu_query.hh b/source/blender/gpu/intern/gpu_query.hh index 5e3159a94f7..0356e145b00 100644 --- a/source/blender/gpu/intern/gpu_query.hh +++ b/source/blender/gpu/intern/gpu_query.hh @@ -56,4 +56,4 @@ class QueryPool { virtual void get_occlusion_result(MutableSpan<uint32_t> r_values) = 0; }; -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/intern/gpu_select_private.h b/source/blender/gpu/intern/gpu_select_private.h index f9a1aea8338..e49feb3fc50 100644 --- a/source/blender/gpu/intern/gpu_select_private.h +++ b/source/blender/gpu/intern/gpu_select_private.h @@ -49,4 +49,4 @@ uint gpu_select_query_end(void); #ifdef __cplusplus } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/gpu/intern/gpu_vertex_buffer.cc b/source/blender/gpu/intern/gpu_vertex_buffer.cc index ea149aaa254..29fa8a89d27 100644 --- a/source/blender/gpu/intern/gpu_vertex_buffer.cc +++ b/source/blender/gpu/intern/gpu_vertex_buffer.cc @@ -331,4 +331,4 @@ void GPU_vertbuf_update_sub(GPUVertBuf *verts, uint start, uint len, void *data) unwrap(verts)->update_sub(start, len, data); } -/** \} */
\ No newline at end of file +/** \} */ diff --git a/source/blender/gpu/opengl/gl_debug_layer.cc b/source/blender/gpu/opengl/gl_debug_layer.cc index 801cb9dbfbd..a4dc4679b7e 100644 --- a/source/blender/gpu/opengl/gl_debug_layer.cc +++ b/source/blender/gpu/opengl/gl_debug_layer.cc @@ -162,4 +162,4 @@ void init_debug_layer(void) #undef DEBUG_WRAP } -} // namespace blender::gpu::debug
\ No newline at end of file +} // namespace blender::gpu::debug diff --git a/source/blender/gpu/opengl/gl_immediate.cc b/source/blender/gpu/opengl/gl_immediate.cc index fd31d77cc80..b71f8766dbb 100644 --- a/source/blender/gpu/opengl/gl_immediate.cc +++ b/source/blender/gpu/opengl/gl_immediate.cc @@ -181,4 +181,4 @@ void GLImmediate::end(void) /** \} */ -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/opengl/gl_immediate.hh b/source/blender/gpu/opengl/gl_immediate.hh index 2b9b90d692b..d0bf0fcdf1f 100644 --- a/source/blender/gpu/opengl/gl_immediate.hh +++ b/source/blender/gpu/opengl/gl_immediate.hh @@ -78,4 +78,4 @@ class GLImmediate : public Immediate { }; }; -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/opengl/gl_index_buffer.cc b/source/blender/gpu/opengl/gl_index_buffer.cc index d68953e6daa..0096a9a500f 100644 --- a/source/blender/gpu/opengl/gl_index_buffer.cc +++ b/source/blender/gpu/opengl/gl_index_buffer.cc @@ -59,4 +59,4 @@ void GLIndexBuf::bind(void) } } -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/opengl/gl_uniform_buffer.cc b/source/blender/gpu/opengl/gl_uniform_buffer.cc index dd305fca555..e6aaddf75d3 100644 --- a/source/blender/gpu/opengl/gl_uniform_buffer.cc +++ b/source/blender/gpu/opengl/gl_uniform_buffer.cc @@ -124,4 +124,4 @@ void GLUniformBuf::unbind(void) /** \} */ -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/opengl/gl_vertex_buffer.cc b/source/blender/gpu/opengl/gl_vertex_buffer.cc index d97fc2c1600..c6efe577e15 100644 --- a/source/blender/gpu/opengl/gl_vertex_buffer.cc +++ b/source/blender/gpu/opengl/gl_vertex_buffer.cc @@ -111,4 +111,4 @@ void GLVertBuf::update_sub(uint start, uint len, void *data) glBufferSubData(GL_ARRAY_BUFFER, start, len, data); } -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/tests/gpu_testing.cc b/source/blender/gpu/tests/gpu_testing.cc index 2772139b8f6..c193a19ad9c 100644 --- a/source/blender/gpu/tests/gpu_testing.cc +++ b/source/blender/gpu/tests/gpu_testing.cc @@ -28,4 +28,4 @@ void GPUTest::TearDown() GHOST_DisposeSystem(ghost_system); } -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/tests/gpu_testing.hh b/source/blender/gpu/tests/gpu_testing.hh index 7e9203d2d7c..cf902a91264 100644 --- a/source/blender/gpu/tests/gpu_testing.hh +++ b/source/blender/gpu/tests/gpu_testing.hh @@ -24,4 +24,4 @@ class GPUTest : public ::testing::Test { void TearDown() override; }; -} // namespace blender::gpu
\ No newline at end of file +} // namespace blender::gpu diff --git a/tests/python/bl_animation_fcurves.py b/tests/python/bl_animation_fcurves.py index 16fd2b36e2c..bacda5c1155 100644 --- a/tests/python/bl_animation_fcurves.py +++ b/tests/python/bl_animation_fcurves.py @@ -32,7 +32,7 @@ class FCurveEvaluationTest(unittest.TestCase): @classmethod def setUpClass(cls): cls.testdir = args.testdir - + def setUp(self): self.assertTrue(self.testdir.exists(), 'Test dir %s should exist' % self.testdir) |