Skip to content

Commit

Permalink
Sync changes from master to 2.7x-support
Browse files Browse the repository at this point in the history
  • Loading branch information
sercero authored and paroj committed Jul 29, 2021
1 parent 9d78761 commit d1b2e7c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Setting any value other than the default `(0, 0, 0)` will result in a mesh with

### Instancing and DotScene Plugin
As of OGRE 1.13 a new feature has been added to the DotScene Plugin where it now accepts the static / instanced keywords for entities.
(for more information read the [DotScene Plugin README](https://github.com/sercero/ogre/blob/master/PlugIns/DotScene/README.md)).
(for more information read the [DotScene Plugin README](https://github.com/OGRECave/ogre/blob/master/PlugIns/DotScene/README.md)).

To use this feature create a new group (Ctrl+G) named as `static.<Group Name>` or `instanced.<Instance Manager Name>` and blender2ogre will automatically add the corresponding attribute to the exported entities in the Scene.
This feature goes hand in hand with [Exporting Particle Systems](#exporting-particle-systems) to create vegetation, debris and other static objects in your scene.
Expand Down
1 change: 1 addition & 0 deletions io_ogre/meshy.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def execute(self, context):
if merged: context.scene.objects.unlink( merged )

try:
os.environ["OGRE_MIN_LOGLEVEL"] = "3" # only warnings and up
if sys.platform.startswith('linux') or sys.platform.startswith('darwin') or sys.platform.startswith('freebsd'):
subprocess.Popen([CONFIG['MESH_PREVIEWER'], path + '/preview.mesh'])
else:
Expand Down
1 change: 1 addition & 0 deletions io_ogre/ogre/scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ def ogre_document(materials):

# Extern files
for mat in materials:
if mat is None: continue
item = doc.createElement('item')
extern.appendChild( item )
item.setAttribute('type', 'material')
Expand Down

0 comments on commit d1b2e7c

Please sign in to comment.