[Bf-blender-cvs] [88028209a93] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Thu May 11 19:51:23 CEST 2017


Commit: 88028209a93c2ace6bdd48f6ea8f2a111f9a95bd
Author: Antonio Vazquez
Date:   Thu May 11 19:11:48 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB88028209a93c2ace6bdd48f6ea8f2a111f9a95bd

Merge branch 'blender2.8' into greasepencil-object

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/properties_scene.py
index dcb20bc74b5,8c65ed2b78a..d1adae94476
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -440,15 -437,9 +440,15 @@@ class SCENE_PT_simplify(SceneButtonsPan
          col.prop(rd, "simplify_ao_sss", text="AO and SSS")
          col.prop(rd, "use_simplify_triangulate")
  
 +class SCENE_PT_gpencil_datapanel(GreasePencilDataPanel, Panel):
 +    bl_space_type = 'PROPERTIES'
 +    bl_region_type = 'WINDOW'
 +    bl_context = "scene"
 +
 +    # NOTE: this is just a wrapper around the generic GP Panel
  
  class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel):
-     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
      _context_path = "scene"
      _property_type = bpy.types.Scene




More information about the Bf-blender-cvs mailing list