Commit: 84877dc53f696ceb30f357b2b7f12b5c65654b52
Author: Nick Wu
Date: Thu Jun 28 08:46:30 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB84877dc53f696ceb30f357b2b7f12b5c65654b52
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
Conflicts:
release/scripts/startup/bl_ui/properties_scene.py
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_scene.py
index e7db3bfd577,1394a9388d0..504e55b89e4
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -720,10 -539,9 +741,12 @@@ classes =
SCENE_PT_rigid_body_cache,
SCENE_PT_rigid_body_field_weights,
SCENE_PT_simplify,
+ SCENE_PT_simplify_viewport,
+ SCENE_PT_lanpr,
+ SCENE_PT_simplify_render,
SCENE_PT_custom_props,
+
+ LANPR_linesets,
)
if __name__ == "__main__": # only for live edit.
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
