[Bf-blender-cvs] [216a3a3] master: Fix T49743: Adding torus in edit mode local mode shows error

Bastien Montagne noreply at git.blender.org
Thu Oct 27 13:25:54 CEST 2016


Commit: 216a3a3826214c665c90b8c89715507e8755b1c7
Author: Bastien Montagne
Date:   Thu Oct 27 13:23:29 2016 +0200
Branches: master
https://developer.blender.org/rB216a3a3826214c665c90b8c89715507e8755b1c7

Fix T49743: Adding torus in edit mode local mode shows error

The 'local' layers were not correctly set when redoing 'add object'
addons using object_utils.py helper (we always want to restore layers
from view in local view, even if we set 'real' layers from operator
afterwards).

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

M	release/scripts/modules/bpy_extras/object_utils.py

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

diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index 87bb84b..88cd739 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -137,12 +137,14 @@ def object_data_add(context, obdata, operator=None, use_active_layer=True, name=
     if context.space_data and context.space_data.type == 'VIEW_3D':
         v3d = context.space_data
 
+    if v3d and v3d.local_view:
+        base.layers_from_view(context.space_data)
+
     if operator is not None and any(operator.layers):
         base.layers = operator.layers
     else:
         if use_active_layer:
             if v3d and v3d.local_view:
-                base.layers_from_view(context.space_data)
                 base.layers[scene.active_layer] = True
             else:
                 if v3d and not v3d.lock_camera_and_layers:




More information about the Bf-blender-cvs mailing list