From e8b5fd6e9ff1f88075e46b6164969c2fe2307cdf Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Mon, 9 Nov 2020 10:13:56 +0100 Subject: [PATCH] Group materials through collections --- .../scripts/addons/io_import_rbdoom_map_json.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/blender/blender-2.83/scripts/addons/io_import_rbdoom_map_json.py b/blender/blender-2.83/scripts/addons/io_import_rbdoom_map_json.py index 1a703f27..1b20ce1a 100644 --- a/blender/blender-2.83/scripts/addons/io_import_rbdoom_map_json.py +++ b/blender/blender-2.83/scripts/addons/io_import_rbdoom_map_json.py @@ -120,7 +120,7 @@ def import_map( filename ): """ radius = get_vector( ent, "light_radius" ) print( radius.magnitude ) - lightData.distance = radius.length + lightData.energy = radius.magnitude * 750.0 lightData.use_nodes = True # create new object with our lamp datablock @@ -302,11 +302,11 @@ def import_map( filename ): for ( tex, groupName ) in groupDict: if mat == tex: group = None - if groupName in bpy.data.groups: - group = bpy.data.groups[ groupName ] - group.objects.link( ob ) + if groupName in bpy.data.collections: + collection = bpy.data.collections[ groupName ] + collection.objects.link( meshObj ) else: - bpy.ops.group.create( name = groupName ) + bpy.ops.collection.create( name = groupName ) @@ -383,8 +383,9 @@ def unregister(): bpy.types.INFO_MT_file_import.remove( menu_func_import ) if __name__ == "__main__": - #register() + register() # test for fast iteration - filename = 'C:/Projects/RBDOOM-3-BFG/base/maps/testmaps/test_box.json' - import_map( filename ) \ No newline at end of file + #filename = 'C:/Projects/RBDOOM-3-BFG/base/maps/testmaps/test_box.json' + #filename = 'C:/Projects/RBDOOM-3-BFG/base/maps/game/pdas.json' + #import_map( filename ) \ No newline at end of file