Skip to content

Commit bce0621

Browse files
sbohezcopybara-github
authored andcommitted
Allow conflict and set associated behaviour for zfar and znear.
PiperOrigin-RevId: 689316663 Change-Id: Ibb06a101249eb03f154162013beeb2fe2b124205
1 parent 272efa3 commit bce0621

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

dm_control/mjcf/schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@
160160
<attribute name="alpha" type="float"/>
161161
<attribute name="fogstart" type="float"/>
162162
<attribute name="fogend" type="float"/>
163-
<attribute name="znear" type="float"/>
164-
<attribute name="zfar" type="float"/>
163+
<attribute name="znear" type="float" conflict_allowed="true" conflict_behavior="min"/>
164+
<attribute name="zfar" type="float" conflict_allowed="true" conflict_behavior="max"/>
165165
<attribute name="haze" type="float"/>
166166
<attribute name="shadowclip" type="float"/>
167167
<attribute name="shadowscale" type="float"/>

0 commit comments

Comments
 (0)