Refactor to allow separate gp render scene and compositing scene
1.7.0 - fix: problem when removing render layers - changed: node distribution refactor, allow separate compositing scene - Compositing scene (holding nodes) can be separated from render scene (holding GP objects and related viewlayers) - Default render named changed from `Render` to `RenderGP` - New properties in exposed Dopesheet N panel to manually set Render scene and Compo scene - Operator expose a `node_scene` parameter to separate where to send nodes - Switch scene button can have an extra button to go in compo scene if found
This commit is contained in:
+85
-48
@@ -1,6 +1,40 @@
|
||||
import bpy
|
||||
from . import gen_vlayer, fn
|
||||
|
||||
|
||||
def add_layer_to_render(ob, node_scene=None):
|
||||
'''Send GP object to render layer
|
||||
return a tuple with report message'''
|
||||
|
||||
# ob = ob or bpy.context.object
|
||||
layer = ob.data.layers.active
|
||||
if not layer:
|
||||
return ('ERROR', 'No active layer')
|
||||
|
||||
node_scene = fn.get_compo_scene(scene_name=node_scene, create=True)
|
||||
|
||||
ct = 0
|
||||
# send scene ?
|
||||
hidden = 0
|
||||
for l in ob.data.layers:
|
||||
if not l.select:
|
||||
if not l.viewlayer_render:
|
||||
# TODO : need to link, can raise error if object is not linked in Render scene yet
|
||||
l.viewlayer_render = fn.get_view_layer('exclude').name
|
||||
continue
|
||||
|
||||
gen_vlayer.get_set_viewlayer_from_gp(ob, l, node_scene=node_scene)
|
||||
|
||||
if l.hide:
|
||||
hidden += 1
|
||||
ct += 1
|
||||
|
||||
if hidden:
|
||||
return ('WARNING', f'{hidden}/{ct} layers are hidden!')
|
||||
|
||||
else:
|
||||
return ('INFO', f'{ct} layer(s) added')
|
||||
|
||||
class GPEXP_OT_add_layer_to_render(bpy.types.Operator):
|
||||
bl_idname = "gp.add_layer_to_render"
|
||||
bl_label = "Add Gp Layer as render nodes"
|
||||
@@ -12,73 +46,76 @@ class GPEXP_OT_add_layer_to_render(bpy.types.Operator):
|
||||
return context.object and context.object.type == 'GPENCIL'
|
||||
|
||||
# mode : bpy.props.StringProperty(options={'SKIP_SAVE'})
|
||||
node_scene : bpy.props.StringProperty(default='',
|
||||
description='Scene where to add nodes, Abort if not found', options={'SKIP_SAVE'})
|
||||
|
||||
def execute(self, context):
|
||||
ob = context.object
|
||||
layer = ob.data.layers.active
|
||||
if not layer:
|
||||
self.report({'ERROR'}, 'No active layer')
|
||||
return {"CANCELLED"}
|
||||
|
||||
ct = 0
|
||||
# send scene ?
|
||||
hided = 0
|
||||
for l in ob.data.layers:
|
||||
if not l.select:
|
||||
if not l.viewlayer_render:
|
||||
# TODO : need to link, can raise error if object is not linked in Render scene yet
|
||||
l.viewlayer_render = fn.get_view_layer('exclude').name
|
||||
continue
|
||||
gen_vlayer.get_set_viewlayer_from_gp(ob, l)
|
||||
|
||||
if l.hide:
|
||||
hided += 1
|
||||
ct += 1
|
||||
|
||||
if hided:
|
||||
self.report({'WARNING'}, f'{hided}/{ct} layers are hided !')
|
||||
|
||||
else:
|
||||
self.report({'INFO'}, f'{ct} layer(s) added to scene "Render"')
|
||||
|
||||
ret = add_layer_to_render(context.object, node_scene=self.node_scene)
|
||||
if isinstance(ret, tuple):
|
||||
self.report({ret[0]}, ret[1])
|
||||
if ret[0] == 'ERROR':
|
||||
return {'CANCELLED'}
|
||||
return {"FINISHED"}
|
||||
|
||||
|
||||
def add_object_to_render(mode='ALL', scene='', node_scene=''):
|
||||
context = bpy.context
|
||||
|
||||
if scene:
|
||||
scn = fn.get_render_scene(scene)
|
||||
else:
|
||||
scn = fn.get_render_scene()
|
||||
|
||||
if node_scene:
|
||||
node_scn = fn.get_compo_scene(scene_name=node_scene, create=True)
|
||||
if not node_scn:
|
||||
return ('ERROR', f'/!\ Node Scene "{node_scene}" not found ! Abort "Add object to Render" !')
|
||||
else:
|
||||
# if not passed add in render scene
|
||||
node_scn = scn
|
||||
|
||||
excludes = [] # ['MA', 'IN'] # Get list dynamically
|
||||
if mode == 'SELECTED':
|
||||
gen_vlayer.export_gp_objects([o for o in context.selected_objects if o.type == 'GPENCIL'], exclude_list=excludes, scene=scn, node_scene=node_scn)
|
||||
|
||||
elif mode == 'ALL':
|
||||
gen_vlayer.export_gp_objects([o for o in context.scene.objects if o.type == 'GPENCIL' and not o.hide_get() and fn.is_valid_name(o.name)], exclude_list=excludes, scene=scn, node_scene=node_scn)
|
||||
|
||||
|
||||
## send operator with mode ALL or SELECTED to batch build
|
||||
class GPEXP_OT_add_objects_to_render(bpy.types.Operator):
|
||||
bl_idname = "gp.add_object_to_render"
|
||||
bl_label = "Add all Gp Layer of active object as render nodes"
|
||||
bl_description = "Setup GP object in render scene\
|
||||
\nNote: 'send all' mode skip hided objects"
|
||||
\nNote: 'send all' mode skip hidden objects"
|
||||
bl_options = {"REGISTER"}
|
||||
|
||||
@classmethod
|
||||
def poll(cls, context):
|
||||
return context.object and context.object.type == 'GPENCIL'
|
||||
|
||||
mode : bpy.props.StringProperty(default='ALL', options={'SKIP_SAVE'})
|
||||
mode : bpy.props.EnumProperty(
|
||||
items=(
|
||||
('ALL', 'All', 'All objects', 0),
|
||||
('SELECTED', 'Selected', 'Selected objects', 0),
|
||||
),
|
||||
default='ALL', options={'SKIP_SAVE'},
|
||||
description='Choice to send all or only selected objects')
|
||||
|
||||
scene : bpy.props.StringProperty(default='',
|
||||
description='Scene where to link object and create viewlayer (create if not exists)', options={'SKIP_SAVE'})
|
||||
|
||||
node_scene : bpy.props.StringProperty(default='',
|
||||
description='Scene where to add nodes, Abort if not found', options={'SKIP_SAVE'})
|
||||
|
||||
def execute(self, context):
|
||||
# create render scene
|
||||
if context.scene.name == 'Scene':
|
||||
scn = fn.get_render_scene()
|
||||
else:
|
||||
scn = context.scene
|
||||
|
||||
|
||||
excludes = [] # ['MA', 'IN'] # Get list dynamically
|
||||
if self.mode == 'SELECTED':
|
||||
gen_vlayer.export_gp_objects([o for o in context.selected_objects if o.type == 'GPENCIL'], exclude_list=excludes, scene=scn)
|
||||
|
||||
elif self.mode == 'ALL':
|
||||
# scn = bpy.data.scenes.get('Scene')
|
||||
# if not scn:
|
||||
# self.report({'ERROR'}, 'Could not found default scene')
|
||||
# return {"CANCELLED"}
|
||||
gen_vlayer.export_gp_objects([o for o in context.scene.objects if o.type == 'GPENCIL' and not o.hide_get() and fn.is_valid_name(o.name)], exclude_list=excludes, scene=scn)
|
||||
|
||||
ret = add_object_to_render(mode=self.mode, scene=self.scene, node_scene=self.node_scene)
|
||||
if isinstance(ret, tuple):
|
||||
self.report({ret[0]}, ret[1])
|
||||
if ret[0] == 'ERROR':
|
||||
return {'CANCELLED'}
|
||||
return {"FINISHED"}
|
||||
|
||||
|
||||
class GPEXP_OT_split_to_scene(bpy.types.Operator):
|
||||
bl_idname = "gp.split_to_scene"
|
||||
bl_label = "Split Objects To Scene"
|
||||
|
||||
Reference in New Issue
Block a user