svn merge ^/trunk/blender -r42564:42586
[blender-staging.git] / source / blender / editors / space_view3d / view3d_toolbar.c
index 49b1b3f723ef39c2fedf66973e0b49577cb3775d..cb6a53c67eb353ce3a47ab786632570cc5ada3aa 100644 (file)
@@ -268,3 +268,4 @@ void VIEW3D_OT_toolshelf(wmOperatorType *ot)
        /* flags */
        ot->flag= 0;
 }
+