TTimo / GtkRadiant

The open source, cross platform level editor for idtech games
http://icculus.org/gtkradiant/
Other
586 stars 155 forks source link

Revert "q3map2 * fix: do not affect styled lightmaps by floodlight", fix #654 #655

Closed illwieckz closed 4 years ago

illwieckz commented 4 years ago

This reverts commit 090fbf3d0ddd3472615f249d7215421fc67b313b. The broken code is not there yet and therefore cannot be fixed yet.

See #654:

Hmm, something weird happened with my workspace. Because of Python3 issue with Scons, I made some python fixes to be able to build the tree again (similar to #651 I haven't yet seen at the time), so basically I wanted to merge the commit above my Python3 branch, check the build, then cherry-pick the commit into a feature branch to ship it on master. It looks like at some point I did something wrong at some merge or cherry-picking step and in fact the branches I built did not included the commit…

Obviously the patch does not apply, I'm surprised it technically applied. In fact it looks like the part of floodlight code that is known to be broken is not yet merged to master so the fix does not apply yet.

@TTimo I created this PR to save you time, but to avoid adding a noisy merge commit, you may select « Rebase and merge » at merge time (drop down arrow on the right of the merge button).