Skip to content

Commit 4344692

Browse files
committedNov 17, 2020
Merge branch 'master' into point-clouds-3d-gui
2 parents 8faa5ee + a5bd9cb commit 4344692

File tree

152 files changed

+5173
-500
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+5173
-500
lines changed
 

‎images/images.qrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<file>flags/pt_PT.svg</file>
3333
<file>flags/ro.svg</file>
3434
<file>flags/ru.svg</file>
35+
<file>flags/sc.svg</file>
3536
<file>flags/sk.svg</file>
3637
<file>flags/sv.svg</file>
3738
<file>flags/sw.svg</file>

‎python/3d/3d_auto.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
%Include auto_generated/materials/qgsabstractmaterialsettings.sip
1515
%Include auto_generated/materials/qgsgoochmaterialsettings.sip
1616
%Include auto_generated/materials/qgsmaterialregistry.sip
17+
%Include auto_generated/materials/qgsnullmaterialsettings.sip
1718
%Include auto_generated/materials/qgsphongmaterialsettings.sip
1819
%Include auto_generated/materials/qgsphongtexturedmaterialsettings.sip
1920
%Include auto_generated/materials/qgssimplelinematerialsettings.sip

0 commit comments

Comments
 (0)
Please sign in to comment.