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

[Antonio Vazquez]

Commit: 15b1acc6b52531e1bba8c3082e13a639b22bf86d
Author: Antonio Vazquez
Date:   Wed May 30 19:28:24 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB15b1acc6b52531e1bba8c3082e13a639b22bf86d

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_scene.py
        source/blender/makesrna/intern/rna_object.c

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



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

diff --cc release/scripts/startup/bl_ui/properties_scene.py
index 6e396f60053,23714584acd..57a5278081e
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -76,9 -73,8 +76,9 @@@ class SCENE_PT_scene(SceneButtonsPanel
          scene = context.scene
  
          layout.prop(scene, "camera")
-         layout.prop(scene, "background_set", text="Background")
-         layout.prop(scene, "active_clip", text="Active Clip")
+         layout.prop(scene, "background_set")
+         layout.prop(scene, "active_clip")
 +        layout.prop(scene, "gpencil_object")
  
  
  class SCENE_PT_unit(SceneButtonsPanel, Panel):
@@@ -106,13 -101,10 +105,9 @@@
  
          col = layout.column()
          col.enabled = unit.system != 'NONE'
-         split = col.split(percentage=0.35)
-         split.label("Unit Scale:")
-         split.prop(unit, "scale_length", text="")
-         split = col.split(percentage=0.35)
-         split.row()
-         split.prop(unit, "use_separate")
+         col.prop(unit, "scale_length")
+         col.prop(unit, "use_separate")
  
 -
  class SceneKeyingSetsPanel:
  
      @staticmethod
@@@ -419,45 -418,17 +421,43 @@@ class SCENE_PT_simplify(SceneButtonsPan
  
          layout.active = rd.use_simplify
  
-         split = layout.split()
+         col = layout.column()
+         col.prop(rd, "simplify_subdivision", text="Max Viewport Subdivision")
+         col.prop(rd, "simplify_child_particles", text="Max Child Particles")
  
-         col = split.column()
-         col.label(text="Viewport:")
-         col.prop(rd, "simplify_subdivision", text="Subdivision")
-         col.prop(rd, "simplify_child_particles", text="Child Particles")
+         col.separator()
  
-         col = split.column()
-         col.label(text="Render:")
-         col.prop(rd, "simplify_subdivision_render", text="Subdivision")
-         col.prop(rd, "simplify_child_particles_render", text="Child Particles")
+         col = layout.column()
+         col.prop(rd, "simplify_subdivision_render", text="Max Render Subdivision")
+         col.prop(rd, "simplify_child_particles_render", text="Max Child Particles")
  
  
 +class SCENE_PT_gp_simplify(SceneButtonsPanel, Panel):
 +    bl_label = "Simplify Grease Pencil"
 +    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY', 'BLENDER_EEVEE'}
 +
 +    def draw_header(self, context):
 +        rd = context.scene.render
 +        self.layout.prop(rd, "simplify_gpencil", text="")
 +
 +    def draw(self, context):
 +        layout = self.layout
 +
 +        rd = context.scene.render
 +
 +        layout.active = rd.simplify_gpencil
 +
 +        row = layout.row()
 +        row.prop(rd, "simplify_gpencil_onplay", text="Only on Play")
 +
 +        split = layout.split()
 +
 +        col = split.column()
 +        col.prop(rd, "simplify_gpencil_view_fill", text="Fill")
 +        col.prop(rd, "simplify_gpencil_remove_lines", text="Remove Fill Lines")
 +        col.prop(rd, "simplify_gpencil_view_modifier", text="Modifiers")
 +
 +
  class SCENE_PT_viewport_display(SceneButtonsPanel, Panel):
      bl_label = "Viewport Display"
      bl_options = {'DEFAULT_CLOSED'}
diff --cc source/blender/makesrna/intern/rna_object.c
index 3ed272aaa0a,16aceca026c..9f53808fb6e
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@@ -1441,17 -1432,6 +1441,11 @@@ int rna_Lamp_object_poll(PointerRNA *UN
  	return ((Object *)value.id.data)->type == OB_LAMP;
  }
  
 +int rna_GPencil_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
 +{
 +	return ((Object *)value.id.data)->type == OB_GPENCIL;
 +}
 +
- int rna_DupliObject_index_get(PointerRNA *ptr)
- {
- 	DupliObject *dob = (DupliObject *)ptr->data;
- 	return dob->persistent_id[0];
- }
- 
  int rna_Object_use_dynamic_topology_sculpting_get(PointerRNA *ptr)
  {
  	SculptSession *ss = ((Object *)ptr->id.data)->sculpt;
diff --cc source/blender/render/intern/source/external_engine.c
index 1f27652f8cd,afdb8c5dd65..5e82f4257dd
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@@ -737,11 -737,8 +737,11 @@@ int RE_engine_render(Render *re, int do
  				re->draw_lock(re->dlh, 0);
  			}
  
- 			type->render_to_image(engine, engine->depsgraph);
+ 			type->render(engine, engine->depsgraph);
  
 +			/* grease pencil render over previous render result */
 +			DRW_render_gpencil(engine, engine->depsgraph);
 +
  			engine_depsgraph_free(engine);
  		}
  		FOREACH_VIEW_LAYER_TO_RENDER_END;