{"action":"created","comment":{"url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/comments/53220926","id":53220926,"diff_hunk":"@@ -326,13 +326,24 @@ bool EngineConfig::LoadFromFile(Context *context, const String& filename)\n     return LoadFromJSON(json);\n }\n \n-void EngineConfig::ApplyConfig(VariantMap& settings)\n+void EngineConfig::ApplyConfig(VariantMap& settings, bool overwrite)\n {\n     VariantMap::ConstIterator itr = engineConfig_.Begin();\n-    while (itr != engineConfig_.End())\n+    if (overwrite)\n+    { \n+        while (itr != engineConfig_.End())\n+        {\n+            settings[itr->first_] = itr->second_;\n+            itr++;\n+        }\n+    }\n+    else\n     {\n-        settings.InsertNew(itr->first_, itr->second_);\n-        itr++;\n+        while (itr != engineConfig_.End())\n+        {\n+            settings.InsertNew(itr->first_, itr->second_);\n+            itr++;\n+        }","path":"Source/Atomic/Engine/EngineConfig.cpp","position":25,"original_position":25,"commit_id":"b6dffe7ee069043fc46fcf81a9464a41fc439ac7","original_commit_id":"b6dffe7ee069043fc46fcf81a9464a41fc439ac7","user":{"login":"JoshEngebretson","id":376203,"avatar_url":"https://avatars.githubusercontent.com/u/376203?v=3","gravatar_id":"","url":"https://api.github.com/users/JoshEngebretson","html_url":"https://github.com/JoshEngebretson","followers_url":"https://api.github.com/users/JoshEngebretson/followers","following_url":"https://api.github.com/users/JoshEngebretson/following{/other_user}","gists_url":"https://api.github.com/users/JoshEngebretson/gists{/gist_id}","starred_url":"https://api.github.com/users/JoshEngebretson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JoshEngebretson/subscriptions","organizations_url":"https://api.github.com/users/JoshEngebretson/orgs","repos_url":"https://api.github.com/users/JoshEngebretson/repos","events_url":"https://api.github.com/users/JoshEngebretson/events{/privacy}","received_events_url":"https://api.github.com/users/JoshEngebretson/received_events","type":"User","site_admin":false},"body":"Cool, we do need to sort EngineConfig more as we discussed... nice add","created_at":"2016-02-17T19:52:27Z","updated_at":"2016-02-17T19:52:27Z","html_url":"https://github.com/AtomicGameEngine/AtomicGameEngine/pull/658#discussion_r53220926","pull_request_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/658","_links":{"self":{"href":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/comments/53220926"},"html":{"href":"https://github.com/AtomicGameEngine/AtomicGameEngine/pull/658#discussion_r53220926"},"pull_request":{"href":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/658"}}},"pull_request":{"url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/658","id":59459313,"html_url":"https://github.com/AtomicGameEngine/AtomicGameEngine/pull/658","diff_url":"https://github.com/AtomicGameEngine/AtomicGameEngine/pull/658.diff","patch_url":"https://github.com/AtomicGameEngine/AtomicGameEngine/pull/658.patch","issue_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/issues/658","number":658,"state":"open","locked":false,"title":"Shader fix, engine settings precedence, \"Force reimport\" context menu option","user":{"login":"mattbenic","id":278871,"avatar_url":"https://avatars.githubusercontent.com/u/278871?v=3","gravatar_id":"","url":"https://api.github.com/users/mattbenic","html_url":"https://github.com/mattbenic","followers_url":"https://api.github.com/users/mattbenic/followers","following_url":"https://api.github.com/users/mattbenic/following{/other_user}","gists_url":"https://api.github.com/users/mattbenic/gists{/gist_id}","starred_url":"https://api.github.com/users/mattbenic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mattbenic/subscriptions","organizations_url":"https://api.github.com/users/mattbenic/orgs","repos_url":"https://api.github.com/users/mattbenic/repos","events_url":"https://api.github.com/users/mattbenic/events{/privacy}","received_events_url":"https://api.github.com/users/mattbenic/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-02-16T08:50:30Z","updated_at":"2016-02-17T19:52:27Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5149a804e0580fa3a587a01d98256ea5d48d851d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/658/commits","review_comments_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/658/comments","review_comment_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/comments{/number}","comments_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/issues/658/comments","statuses_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/statuses/b6dffe7ee069043fc46fcf81a9464a41fc439ac7","head":{"label":"LumaDigital:master","ref":"master","sha":"b6dffe7ee069043fc46fcf81a9464a41fc439ac7","user":{"login":"LumaDigital","id":1375014,"avatar_url":"https://avatars.githubusercontent.com/u/1375014?v=3","gravatar_id":"","url":"https://api.github.com/users/LumaDigital","html_url":"https://github.com/LumaDigital","followers_url":"https://api.github.com/users/LumaDigital/followers","following_url":"https://api.github.com/users/LumaDigital/following{/other_user}","gists_url":"https://api.github.com/users/LumaDigital/gists{/gist_id}","starred_url":"https://api.github.com/users/LumaDigital/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LumaDigital/subscriptions","organizations_url":"https://api.github.com/users/LumaDigital/orgs","repos_url":"https://api.github.com/users/LumaDigital/repos","events_url":"https://api.github.com/users/LumaDigital/events{/privacy}","received_events_url":"https://api.github.com/users/LumaDigital/received_events","type":"Organization","site_admin":false},"repo":{"id":35275044,"name":"AtomicGameEngine","full_name":"LumaDigital/AtomicGameEngine","owner":{"login":"LumaDigital","id":1375014,"avatar_url":"https://avatars.githubusercontent.com/u/1375014?v=3","gravatar_id":"","url":"https://api.github.com/users/LumaDigital","html_url":"https://github.com/LumaDigital","followers_url":"https://api.github.com/users/LumaDigital/followers","following_url":"https://api.github.com/users/LumaDigital/following{/other_user}","gists_url":"https://api.github.com/users/LumaDigital/gists{/gist_id}","starred_url":"https://api.github.com/users/LumaDigital/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LumaDigital/subscriptions","organizations_url":"https://api.github.com/users/LumaDigital/orgs","repos_url":"https://api.github.com/users/LumaDigital/repos","events_url":"https://api.github.com/users/LumaDigital/events{/privacy}","received_events_url":"https://api.github.com/users/LumaDigital/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/LumaDigital/AtomicGameEngine","description":"The Atomic Game Engine: http://www.AtomicGameEngine.com","fork":true,"url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine","forks_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/forks","keys_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/keys{/key_id}","collaborators_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/teams","hooks_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/hooks","issue_events_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/issues/events{/number}","events_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/events","assignees_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/assignees{/user}","branches_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/branches{/branch}","tags_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/tags","blobs_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/git/refs{/sha}","trees_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/git/trees{/sha}","statuses_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/statuses/{sha}","languages_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/languages","stargazers_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/stargazers","contributors_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/contributors","subscribers_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/subscribers","subscription_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/subscription","commits_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/commits{/sha}","git_commits_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/git/commits{/sha}","comments_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/comments{/number}","issue_comment_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/issues/comments{/number}","contents_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/contents/{+path}","compare_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/compare/{base}...{head}","merges_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/merges","archive_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/downloads","issues_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/issues{/number}","pulls_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/pulls{/number}","milestones_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/milestones{/number}","notifications_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/labels{/name}","releases_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/releases{/id}","deployments_url":"https://api.github.com/repos/LumaDigital/AtomicGameEngine/deployments","created_at":"2015-05-08T11:12:10Z","updated_at":"2016-01-14T06:58:46Z","pushed_at":"2016-02-17T12:22:49Z","git_url":"git://github.com/LumaDigital/AtomicGameEngine.git","ssh_url":"git@github.com:LumaDigital/AtomicGameEngine.git","clone_url":"https://github.com/LumaDigital/AtomicGameEngine.git","svn_url":"https://github.com/LumaDigital/AtomicGameEngine","homepage":"","size":83612,"stargazers_count":2,"watchers_count":2,"language":"C","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":2,"default_branch":"master"}},"base":{"label":"AtomicGameEngine:master","ref":"master","sha":"94563a143635d076e514febdecefd2c1543559c1","user":{"login":"AtomicGameEngine","id":9641691,"avatar_url":"https://avatars.githubusercontent.com/u/9641691?v=3","gravatar_id":"","url":"https://api.github.com/users/AtomicGameEngine","html_url":"https://github.com/AtomicGameEngine","followers_url":"https://api.github.com/users/AtomicGameEngine/followers","following_url":"https://api.github.com/users/AtomicGameEngine/following{/other_user}","gists_url":"https://api.github.com/users/AtomicGameEngine/gists{/gist_id}","starred_url":"https://api.github.com/users/AtomicGameEngine/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AtomicGameEngine/subscriptions","organizations_url":"https://api.github.com/users/AtomicGameEngine/orgs","repos_url":"https://api.github.com/users/AtomicGameEngine/repos","events_url":"https://api.github.com/users/AtomicGameEngine/events{/privacy}","received_events_url":"https://api.github.com/users/AtomicGameEngine/received_events","type":"Organization","site_admin":false},"repo":{"id":29790707,"name":"AtomicGameEngine","full_name":"AtomicGameEngine/AtomicGameEngine","owner":{"login":"AtomicGameEngine","id":9641691,"avatar_url":"https://avatars.githubusercontent.com/u/9641691?v=3","gravatar_id":"","url":"https://api.github.com/users/AtomicGameEngine","html_url":"https://github.com/AtomicGameEngine","followers_url":"https://api.github.com/users/AtomicGameEngine/followers","following_url":"https://api.github.com/users/AtomicGameEngine/following{/other_user}","gists_url":"https://api.github.com/users/AtomicGameEngine/gists{/gist_id}","starred_url":"https://api.github.com/users/AtomicGameEngine/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AtomicGameEngine/subscriptions","organizations_url":"https://api.github.com/users/AtomicGameEngine/orgs","repos_url":"https://api.github.com/users/AtomicGameEngine/repos","events_url":"https://api.github.com/users/AtomicGameEngine/events{/privacy}","received_events_url":"https://api.github.com/users/AtomicGameEngine/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/AtomicGameEngine/AtomicGameEngine","description":"The Atomic Game Engine: http://www.AtomicGameEngine.com","fork":false,"url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine","forks_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/forks","keys_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/keys{/key_id}","collaborators_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/teams","hooks_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/hooks","issue_events_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/issues/events{/number}","events_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/events","assignees_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/assignees{/user}","branches_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/branches{/branch}","tags_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/tags","blobs_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/git/refs{/sha}","trees_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/git/trees{/sha}","statuses_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/statuses/{sha}","languages_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/languages","stargazers_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/stargazers","contributors_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/contributors","subscribers_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/subscribers","subscription_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/subscription","commits_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/commits{/sha}","git_commits_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/git/commits{/sha}","comments_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/comments{/number}","issue_comment_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/issues/comments{/number}","contents_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/contents/{+path}","compare_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/compare/{base}...{head}","merges_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/merges","archive_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/downloads","issues_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/issues{/number}","pulls_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls{/number}","milestones_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/milestones{/number}","notifications_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/labels{/name}","releases_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/releases{/id}","deployments_url":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/deployments","created_at":"2015-01-24T20:35:25Z","updated_at":"2016-02-16T00:41:42Z","pushed_at":"2016-02-16T08:50:30Z","git_url":"git://github.com/AtomicGameEngine/AtomicGameEngine.git","ssh_url":"git@github.com:AtomicGameEngine/AtomicGameEngine.git","clone_url":"https://github.com/AtomicGameEngine/AtomicGameEngine.git","svn_url":"https://github.com/AtomicGameEngine/AtomicGameEngine","homepage":"","size":84757,"stargazers_count":346,"watchers_count":346,"language":"C","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":65,"mirror_url":null,"open_issues_count":227,"forks":65,"open_issues":227,"watchers":346,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/658"},"html":{"href":"https://github.com/AtomicGameEngine/AtomicGameEngine/pull/658"},"issue":{"href":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/issues/658"},"comments":{"href":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/issues/658/comments"},"review_comments":{"href":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/658/comments"},"review_comment":{"href":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/pulls/658/commits"},"statuses":{"href":"https://api.github.com/repos/AtomicGameEngine/AtomicGameEngine/statuses/b6dffe7ee069043fc46fcf81a9464a41fc439ac7"}}}}