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
path: root/release
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rwxr-xr-xrelease/bin/blender-softwaregl22
-rw-r--r--release/datafiles/LICENSE-bfont.ttf.txt1
-rw-r--r--release/plugins/Makefile3
-rw-r--r--release/plugins/bmake2
-rw-r--r--release/plugins/sequence/Makefile3
-rw-r--r--release/plugins/sequence/blur.c1
-rw-r--r--release/plugins/sequence/scatter.c1
-rw-r--r--release/plugins/texture/Makefile3
-rw-r--r--release/plugins/texture/clouds2.c1
-rw-r--r--release/plugins/texture/tiles.c1
-rw-r--r--release/scripts/startup/bl_operators/uvcalc_smart_project.py4
-rw-r--r--release/scripts/startup/bl_operators/vertexpaint_dirt.py2
-rw-r--r--release/scripts/startup/bl_operators/wm.py34
-rw-r--r--release/scripts/startup/bl_ui/__init__.py2
-rw-r--r--release/scripts/startup/bl_ui/properties_particle.py16
-rw-r--r--release/scripts/startup/bl_ui/properties_physics_fluid.py4
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py8
-rw-r--r--release/text/readme.html2
-rw-r--r--release/windows/installer/00.sconsblender.nsi1
19 files changed, 73 insertions, 38 deletions
diff --git a/release/bin/blender-softwaregl b/release/bin/blender-softwaregl
new file mode 100755
index 00000000000..3cd96d2ff34
--- /dev/null
+++ b/release/bin/blender-softwaregl
@@ -0,0 +1,22 @@
+#!/bin/sh
+BF_DIST_BIN=`dirname "$0"`
+BF_PROGRAM="blender" # BF_PROGRAM=`basename "$0"`-bin
+exitcode=0
+
+LD_LIBRARY_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH}
+
+if [ -n "$LD_LIBRARYN32_PATH" ]; then
+ LD_LIBRARYN32_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN32_PATH}
+fi
+if [ -n "$LD_LIBRARYN64_PATH" ]; then
+ LD_LIBRARYN64_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN64_PATH}
+fi
+if [ -n "$LD_LIBRARY_PATH_64" ]; then
+ LD_LIBRARY_PATH_64=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH_64}
+fi
+
+export LD_LIBRARY_PATH LD_LIBRARYN32_PATH LD_LIBRARYN64_PATH LD_LIBRARY_PATH_64 LD_PRELOAD
+
+"$BF_DIST_BIN/$BF_PROGRAM" ${1+"$@"}
+exitcode=$?
+exit $exitcode
diff --git a/release/datafiles/LICENSE-bfont.ttf.txt b/release/datafiles/LICENSE-bfont.ttf.txt
index 754089661b0..4aa22365c83 100644
--- a/release/datafiles/LICENSE-bfont.ttf.txt
+++ b/release/datafiles/LICENSE-bfont.ttf.txt
@@ -98,4 +98,3 @@ dealings in this Font Software without prior written authorization
from Tavmjong Bah. For further information, contact: tavmjong @ free
. fr.
-$Id$
diff --git a/release/plugins/Makefile b/release/plugins/Makefile
index ee7086b331d..353e559e622 100644
--- a/release/plugins/Makefile
+++ b/release/plugins/Makefile
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
diff --git a/release/plugins/bmake b/release/plugins/bmake
index 9740bfa716a..e2f9e9cc596 100644
--- a/release/plugins/bmake
+++ b/release/plugins/bmake
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
diff --git a/release/plugins/sequence/Makefile b/release/plugins/sequence/Makefile
index ab847adf5fe..2b12e62d24a 100644
--- a/release/plugins/sequence/Makefile
+++ b/release/plugins/sequence/Makefile
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
diff --git a/release/plugins/sequence/blur.c b/release/plugins/sequence/blur.c
index cec3351e976..e95c243b558 100644
--- a/release/plugins/sequence/blur.c
+++ b/release/plugins/sequence/blur.c
@@ -1,5 +1,4 @@
/**
- * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
diff --git a/release/plugins/sequence/scatter.c b/release/plugins/sequence/scatter.c
index 4741b33ce0e..73e97e165ca 100644
--- a/release/plugins/sequence/scatter.c
+++ b/release/plugins/sequence/scatter.c
@@ -1,5 +1,4 @@
/**
- * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
diff --git a/release/plugins/texture/Makefile b/release/plugins/texture/Makefile
index ab847adf5fe..2b12e62d24a 100644
--- a/release/plugins/texture/Makefile
+++ b/release/plugins/texture/Makefile
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
diff --git a/release/plugins/texture/clouds2.c b/release/plugins/texture/clouds2.c
index d38913951c3..454e8e28206 100644
--- a/release/plugins/texture/clouds2.c
+++ b/release/plugins/texture/clouds2.c
@@ -1,5 +1,4 @@
/**
- * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
diff --git a/release/plugins/texture/tiles.c b/release/plugins/texture/tiles.c
index 3b533d456b4..c7af6e58fa4 100644
--- a/release/plugins/texture/tiles.c
+++ b/release/plugins/texture/tiles.c
@@ -1,5 +1,4 @@
/**
- * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
index 1248fc24ed7..66d0d72efc1 100644
--- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py
+++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
@@ -1105,8 +1105,8 @@ from bpy.props import FloatProperty
class SmartProject(Operator):
- '''This script projection unwraps the selected faces of a mesh. ''' \
- '''it operates on all selected mesh objects, and can be used unwrap selected faces, or all faces'''
+ '''This script projection unwraps the selected faces of a mesh ''' \
+ '''(it operates on all selected mesh objects, and can be used to unwrap selected faces, or all faces)'''
bl_idname = "uv.smart_project"
bl_label = "Smart UV Project"
bl_options = {'REGISTER', 'UNDO'}
diff --git a/release/scripts/startup/bl_operators/vertexpaint_dirt.py b/release/scripts/startup/bl_operators/vertexpaint_dirt.py
index 5fb5c7f39cf..ea58864f7c2 100644
--- a/release/scripts/startup/bl_operators/vertexpaint_dirt.py
+++ b/release/scripts/startup/bl_operators/vertexpaint_dirt.py
@@ -159,7 +159,7 @@ class VertexPaintDirt(Operator):
)
blur_iterations = IntProperty(
name="Blur Iterations",
- description="Number times to blur the colors (higher blurs more)",
+ description="Number of times to blur the colors (higher blurs more)",
min=0, max=40,
default=1,
)
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index a539e2693c1..1e469275e77 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1179,7 +1179,31 @@ class WM_OT_copy_prev_settings(Operator):
return {'CANCELLED'}
+class WM_OT_blenderplayer_start(Operator):
+ '''Launches the Blenderplayer with the current blendfile'''
+ bl_idname = "wm.blenderplayer_start"
+ bl_label = "Start"
+
+ import os
+ blender_bin_path = bpy.app.binary_path
+ blender_bin_dir = os.path.dirname(blender_bin_path)
+ ext = os.path.splitext(blender_bin_path)[-1]
+ player_path = os.path.join(blender_bin_dir, 'blenderplayer' + ext)
+
+ def execute(self, context):
+ import sys
+ import subprocess
+ import os
+
+ if sys.platform == 'darwin':
+ self.player_path = os.path.join(self.blender_bin_dir, '../../../blenderplayer.app/Contents/MacOS/blenderplayer')
+
+ filepath = bpy.app.tempdir + "game.blend"
+ bpy.ops.wm.save_as_mainfile(filepath=filepath, check_existing=False, copy=True)
+ subprocess.call([self.player_path, filepath])
+ return {'FINISHED'}
+
class WM_OT_keyconfig_test(Operator):
"Test keyconfig for conflicts"
bl_idname = "wm.keyconfig_test"
@@ -1451,7 +1475,7 @@ class WM_OT_operator_cheat_sheet(Operator):
class WM_OT_addon_enable(Operator):
"Enable an addon"
bl_idname = "wm.addon_enable"
- bl_label = "Enable Add-On"
+ bl_label = "Enable Addon"
module = StringProperty(
name="Module",
@@ -1482,7 +1506,7 @@ class WM_OT_addon_enable(Operator):
class WM_OT_addon_disable(Operator):
"Disable an addon"
bl_idname = "wm.addon_disable"
- bl_label = "Disable Add-On"
+ bl_label = "Disable Addon"
module = StringProperty(
name="Module",
@@ -1499,7 +1523,7 @@ class WM_OT_addon_disable(Operator):
class WM_OT_addon_install(Operator):
"Install an addon"
bl_idname = "wm.addon_install"
- bl_label = "Install Add-On..."
+ bl_label = "Install Addon..."
overwrite = BoolProperty(
name="Overwrite",
@@ -1667,7 +1691,7 @@ class WM_OT_addon_install(Operator):
class WM_OT_addon_remove(Operator):
"Disable an addon"
bl_idname = "wm.addon_remove"
- bl_label = "Remove Add-On"
+ bl_label = "Remove Addon"
module = StringProperty(
name="Module",
@@ -1722,7 +1746,7 @@ class WM_OT_addon_remove(Operator):
class WM_OT_addon_expand(Operator):
- "Display more information on this add-on"
+ "Display more information on this addon"
bl_idname = "wm.addon_expand"
bl_label = ""
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 2e54631afa3..682341cbf2f 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -110,7 +110,7 @@ def register():
WindowManager.addon_filter = EnumProperty(
items=addon_filter_items,
name="Category",
- description="Filter add-ons by category",
+ description="Filter addons by category",
)
WindowManager.addon_support = EnumProperty(
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 0e7fccae8df..2216d2b2170 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -76,15 +76,21 @@ class ParticleButtonsPanel():
class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel):
bl_label = ""
bl_options = {'HIDE_HEADER'}
- COMPAT_ENGINES = {'BLENDER_RENDER'}
+ # COMPAT_ENGINES = {'BLENDER_RENDER'}
@classmethod
def poll(cls, context):
engine = context.scene.render.engine
- return (context.particle_system or context.object or context.space_data.pin_id) and (engine in cls.COMPAT_ENGINES)
+ return (context.particle_system or context.object or context.space_data.pin_id)# and (engine in cls.COMPAT_ENGINES)
def draw(self, context):
layout = self.layout
+
+ if context.scene.render.engine == "BLENDER_GAME":
+ layout.label("The Blender particle system is")
+ layout.label("not available for use in the")
+ layout.label("Blender Game Engine")
+ return
ob = context.object
psys = context.particle_system
@@ -145,7 +151,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel):
#row.label(text="Render")
if part.is_fluid:
- layout.label(text=str(part.count) + " fluid particles for this frame")
+ layout.label(text="{} fluid particles for this frame".format(str(part.count)))
return
row = col.row()
@@ -504,7 +510,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel):
col.label(text="Fluid properties:")
col.prop(fluid, "stiffness", text="Stiffness")
col.prop(fluid, "linear_viscosity", text="Viscosity")
- col.prop(fluid, "buoyancy", text="Buoancy", slider=True)
+ col.prop(fluid, "buoyancy", text="Buoyancy", slider=True)
col = split.column()
col.label(text="Advanced:")
@@ -1162,7 +1168,7 @@ class PARTICLE_PT_force_fields(ParticleButtonsPanel, Panel):
class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel):
- bl_label = "Vertexgroups"
+ bl_label = "Vertex Groups"
bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER'}
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index c25b42e298e..efb760c0b43 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -206,7 +206,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel):
col = split.column()
if scene.use_gravity:
- col.label(text="Using Scene Gravity", icon="SCENE_DATA")
+ col.label(text="Use Scene Gravity", icon="SCENE_DATA")
sub = col.column()
sub.enabled = False
sub.prop(fluid, "gravity", text="")
@@ -215,7 +215,7 @@ class PHYSICS_PT_domain_gravity(PhysicButtonsPanel, Panel):
col.prop(fluid, "gravity", text="")
if scene.unit_settings.system != 'NONE':
- col.label(text="Using Scene Size Units", icon="SCENE_DATA")
+ col.label(text="Use Scene Size Units", icon="SCENE_DATA")
sub = col.column()
sub.enabled = False
sub.prop(fluid, "simulation_scale", text="Metres")
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 96a08e57157..c6c4a8f3335 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -762,7 +762,7 @@ class USERPREF_MT_ndof_settings(Menu):
layout.prop(input_prefs, "ndof_show_guide")
layout.separator()
- layout.label(text="orbit options")
+ layout.label(text="Orbit options")
if input_prefs.view_rotate_method == 'TRACKBALL':
layout.prop(input_prefs, "ndof_roll_invert_axis")
layout.prop(input_prefs, "ndof_tilt_invert_axis")
@@ -771,13 +771,13 @@ class USERPREF_MT_ndof_settings(Menu):
layout.prop(input_prefs, "ndof_orbit_invert_axes")
layout.separator()
- layout.label(text="pan options")
+ layout.label(text="Pan options")
layout.prop(input_prefs, "ndof_panx_invert_axis")
layout.prop(input_prefs, "ndof_pany_invert_axis")
layout.prop(input_prefs, "ndof_panz_invert_axis")
layout.separator()
- layout.label(text="fly options")
+ layout.label(text="Fly options")
layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY')
layout.prop(input_prefs, "ndof_lock_horizon", icon='NDOF_DOM')
@@ -966,7 +966,7 @@ class USERPREF_PT_addons(Panel):
if info["support"] not in support:
continue
- # check if add-on should be visible with current filters
+ # check if addon should be visible with current filters
if (filter == "All") or \
(filter == info["category"]) or \
(filter == "Enabled" and is_enabled) or \
diff --git a/release/text/readme.html b/release/text/readme.html
index e0bef8a50e1..8c5ead49036 100644
--- a/release/text/readme.html
+++ b/release/text/readme.html
@@ -36,7 +36,7 @@
<p class="body"><b>Linux, FreeBSD, Solaris: </b>Unpack the archive, Then run the Blender executable.</p>
<p class="body"><b>Mac OS X: </b>The downloaded package includes blender.app. Optionally copy this to your Applications folder, and add it to the dock by dragging it from there to the dock.</p>
<p></p>
-<p class="body"><b>Installing Add-ons (all systems)</b> Add-ons can be installed from the user preferences addons section, download an addon as a .py or .zip file, then press the "Install Add-on" button and select the file to install it.</p>
+<p class="body"><b>Installing Addons (all systems)</b> Addons can be installed from the user preferences addons section, download an addon as a .py or .zip file, then press the "Install Addon" button and select the file to install it.</p>
<p><br></p>
<p class="header"><b>Getting Started</b></p>
<p class="body">When opening Blender, you’ll see large 3D view in the center, a Toolbar on the left, a Properties area and an Outliner area on the right and a Timeline at the bottom.</p>
diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index eddd215c64d..eb9b6629108 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -1,5 +1,4 @@
;
-; $Id$
;
; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net)
;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 12:10:41 +0300