Commit: 86b53f79d379b5571368eca927971270feb47561
Author: Antonio Vazquez
Date: Wed Jul 11 16:28:59 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB86b53f79d379b5571368eca927971270feb47561
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/space_view3d/space_view3d.c
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_scene.py
index ada0e00471b,d0fce0a2582..cbca885b73e
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -480,68 -481,6 +480,33 @@@ class SCENE_PT_simplify_render(SceneBut
col.prop(rd, "simplify_child_particles_render", text="Max Child
Particles")
+class SCENE_PT_simplify_greasepencil(SceneButtonsPanel, Panel):
+ bl_label = "Simplify Grease Pencil"
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY',
'BLENDER_EEVEE'}
+ bl_options = {'DEFAULT_CLOSED'}
+
+ 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'}
-
- @classmethod
- def poll(cls, context):
- return True
-
- def draw(self, context):
- layout = self.layout
- layout.use_property_split = True
- scene = context.scene
- col = layout.column()
- col.prop(scene.display, "light_direction")
- col.prop(scene.display, "shadow_shift")
-
-
- class SCENE_PT_viewport_display_ssao(SceneButtonsPanel, Panel):
- bl_label = "Screen Space Ambient Occlusion"
- bl_parent_id = "SCENE_PT_viewport_display"
-
- @classmethod
- def poll(cls, context):
- return True
-
- def draw(self, context):
- layout = self.layout
- layout.use_property_split = True
- scene = context.scene
- col = layout.column()
- col.prop(scene.display, "matcap_ssao_samples")
- col.prop(scene.display, "matcap_ssao_distance")
- col.prop(scene.display, "matcap_ssao_attenuation")
-
-
class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel):
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'}
_context_path = "scene"
diff --cc source/blender/editors/space_view3d/space_view3d.c
index 95dc427bd20,5cff64218ec..6e1250bed2e
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -349,12 -348,6 +349,10 @@@ static SpaceLink *view3d_new(const ScrA
v3d->near = 0.01f;
v3d->far = 1000.0f;
+ v3d->gpencil_grid_size[0] = GP_DEFAULT_GRID_SIZE;
+ v3d->gpencil_grid_size[1] = GP_DEFAULT_GRID_SIZE;
+ ARRAY_SET_ITEMS(v3d->gpencil_paper_color, 1.0f, 1.0f, 1.0f, 0.7f);
+
- v3d->twflag |= U.manipulator_flag & V3D_MANIPULATOR_DRAW;
-
v3d->bundle_size = 0.2f;
v3d->bundle_drawtype = OB_PLAINAXES;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
