Details

Reviewers

Campbell Barton (campbellbarton)
Jorge Bernal (lordloki)
Dalai Felinto (dfelinto)
Mitchell Stokes (moguri)

Commits

rBS176ecd9c9ca9: BGE : Fix for T43724 and T41599 addObject() with KX_FontObject and overlay scene
rB176ecd9c9ca9: BGE : Fix for T43724 and T41599 addObject() with KX_FontObject and overlay scene

Summary

GetGameObjectType is overwritten in KX_FontObject to differentiate a font object into AddNodeReplicaObject function. Now, in this function, we add fonts in the appropriate list.

Diff Detail

Repository: rB Blender
Branch: ge_fix_fond_adding

Event Timeline

Porteries Tristan (panzergame) updated this revision to Diff 3588.Feb 19 2015, 3:23 PM

Porteries Tristan (panzergame) retitled this revision from to BGE : Fix T43724 addObject() with KX_FontObject and overlay scene.

Porteries Tristan (panzergame) updated this object.

Porteries Tristan (panzergame) added reviewers: Campbell Barton (campbellbarton), Mitchell Stokes (moguri), Dalai Felinto (dfelinto).

Porteries Tristan (panzergame) added projects: Game Logic, Game Engine.

Porteries Tristan (panzergame) retitled this revision from BGE : Fix T43724 addObject() with KX_FontObject and overlay scene to BGE : Fix T43724; T41599 addObject() with KX_FontObject and overlay scene.Feb 22 2015, 4:46 PM

Can you install arcanist and send the patch via 'arc diff'? Otherwise we can't see the context of the patch (i.e., to see more lines of the changed files before or after the changes)

source/gameengine/Ketsji/KX_Scene.h
143 ↗	(On Diff #3588)	Fine by me, don't need to add those comments in the final patch though.

Porteries Tristan (panzergame) updated this revision to Diff 3608.Feb 23 2015, 6:55 PM

Porteries Tristan (panzergame) edited edge metadata.

patch with arcanist

I still didn't understand what's the point of this patch. Does it change anything for the final user?

source/gameengine/Ketsji/KX_Scene.cpp
535	replace if by else if or even better, by a switch.

The patch just corrects crashes, because if we add font in overlay scene the font it's added in the scene which contains the logic controller, and yes it's change nothing for the final user.

The patch just corrects crashes, because if we add font in overlay scene the font it's added in the scene which contains the logic controller, and yes it's change nothing for the final user.

If it fixes a crash then it certainly helps the user ;) Do you have a sample file that reproduces the crash? Was it ever reported?

Example files are in the bug in the title : T43724 and T41599.

Replace if by else if.

Jorge Bernal (lordloki) added a subscriber: Jorge Bernal (lordloki).Feb 27 2015, 11:49 AM

Jorge Bernal (lordloki) added inline comments.

source/gameengine/Ketsji/KX_FontObject.h
73	should be public?

set function GetGameObjectType() public, how that compiles and works before ?

Looks good to me.

Note: I checked both bugs and with these changes they are working now.

Jorge Bernal (lordloki) accepted this revision.Feb 28 2015, 2:25 AM

Jorge Bernal (lordloki) added a reviewer: Jorge Bernal (lordloki).

This revision is now accepted and ready to land.Feb 28 2015, 2:25 AM

Jorge Bernal (lordloki) retitled this revision from BGE : Fix T43724; T41599 addObject() with KX_FontObject and overlay scene to BGE : Fix for T43724 and T41599 addObject() with KX_FontObject and overlay scene.Mar 15 2015, 9:44 AM

Jorge Bernal (lordloki) updated this object.

Jorge Bernal (lordloki) edited edge metadata.

Closed by commit rB176ecd9c9ca9: BGE : Fix for T43724 and T41599 addObject() with KX_FontObject and overlay scene (authored by Porteries Tristan (panzergame), committed by Jorge Bernal (lordloki)). · Explain WhyMar 15 2015, 10:54 AM

This revision was automatically updated to reflect the committed changes.

Gaia Clary (gaiaclary) mentioned this in rB9ed5a1073ef9: fix D1130 renamed the enum OBJ_FONT to OBJ_TEXT to avoid naming conflicts in….Mar 16 2015, 6:47 PM

Gaia Clary (gaiaclary) mentioned this in rBS9ed5a1073ef9: fix D1130 renamed the enum OBJ_FONT to OBJ_TEXT to avoid naming conflicts in….Mar 25 2015, 12:26 PM

Commit	Tree	Parents	Author	Summary	Date
15e3957af290	e1e195c8ed07	ca866bd15ffd	Porteries Tristan	init	Feb 19 2015, 3:14 PM
ca866bd15ffd	edcd5e5bb3a7	70040fd92dcc 0aa258117d52	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 26 2015, 7:07 PM
70040fd92dcc	2226fd67ca2d	9d668e471c89 6a65bc91e2d0	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 25 2015, 6:24 PM
9d668e471c89	9235f0a7f4f9	dc32acec20b2 07c61e93893c	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 24 2015, 12:56 PM
dc32acec20b2	78f0d05cf3cb	8b6b00db014f 2081fd1d7de4	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 23 2015, 7:08 PM
8b6b00db014f	4d68b59e5b78	f6a5488a72f1 67fcf5256d81	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 23 2015, 5:52 PM
f6a5488a72f1	32b88c7f4ea6	f1056aa6bf46 63b0a7feb289	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 22 2015, 3:59 PM
f1056aa6bf46	834b30b5b04e	496c13b93234 51b0ae8a85db	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 20 2015, 12:06 PM
496c13b93234	83c7e8246b20	d6d0dc463fc8 185e30122969	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 20 2015, 10:29 AM
d6d0dc463fc8	6aa7428ee932	1d2c88a04155 83220ab7fb9a	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 19 2015, 7:58 PM
1d2c88a04155	a9bbd6ee08dd	78e6056e7d51 0f652501c7b5	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 19 2015, 2:19 PM
78e6056e7d51	3462f8d398fd	f634022e190a 27d1446d24cc	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 19 2015, 12:50 PM
f634022e190a	0f0bef5911c9	9dd0b739d208 9fc2c3732878	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 19 2015, 11:04 AM
9dd0b739d208	e6f22c0618b8	4a982aef075c e6f40b4cebe5	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 17 2015, 7:17 PM
4a982aef075c	77dfb653f76e	d411f4914539 9a10b208bacd	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 16 2015, 10:48 AM
d411f4914539	8004bfaae31c	d56437bd6288 2e9105cc964a	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 15 2015, 3:28 PM
d56437bd6288	445333b7cf4a	6dacfcfb5659 35567d563dbc	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 15 2015, 1:28 PM
6dacfcfb5659	e9869e20a832	a248fb66e7c0 ab77466105ec	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 13 2015, 8:28 PM
a248fb66e7c0	8e552854b8b8	d7d61b0fb263 8de421bbf1c2	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 12 2015, 8:39 PM
d7d61b0fb263	a9b7f48ab845	2736de545db2 27b2ab8cf4ae	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 11 2015, 9:12 PM
2736de545db2	b61cd0d3f2c6	a1d3de78b234 de85d6cdbf13	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 11 2015, 6:06 PM
a1d3de78b234	65113f783173	82d0e2cb28d1 f2951c23cf8d	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 11 2015, 11:29 AM
82d0e2cb28d1	4a48cd6f3022	1efdf261bdc7 6971bd9a4fbb	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 10 2015, 9:45 AM
1efdf261bdc7	74fbd8c646cc	4516c17cebc6 12ed439d8ef9	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 9 2015, 9:56 AM
4516c17cebc6	ba3e899373fb	26431a22ecb1 a19229b80c18	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 8 2015, 10:34 PM
26431a22ecb1	4efe8b5ab846	88ff4417bcec 9c9dab095d49	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 7 2015, 10:05 PM
88ff4417bcec	4c73ce0dbb39	518eae2d6043 ca06c3343e4c	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 6 2015, 11:42 PM
518eae2d6043	165cfcc49c64	769780e13040 4e27f638286e	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 4 2015, 9:47 PM
769780e13040	f108a16243cb	ae0f18805698 15cd2222702d	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Feb 3 2015, 6:16 PM
ae0f18805698	1453923f0c1d	10b8deb9e2e3 26f9a9245387	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 31 2015, 10:59 PM
10b8deb9e2e3	bde069261e67	24489f8905e9 0da38ada0794	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 30 2015, 6:36 PM
24489f8905e9	ab18e65e9455	918a037b6f33 87986ed139a7	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 29 2015, 1:20 PM
918a037b6f33	8a6d78a55384	33961b3fa9fa cde9b1b948f0	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 28 2015, 4:02 PM
33961b3fa9fa	13ac1aede6b9	32149f061e21 3f8f4175c303	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 27 2015, 6:27 PM
32149f061e21	de5fd4a9cfea	4293bb92d061 58f7deca583a	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 27 2015, 1:22 PM
4293bb92d061	51480ef2e50e	3b6504febdc9 9e48f010c41d	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 27 2015, 12:56 PM
3b6504febdc9	0696aa80f2d9	52386c4d18a4 ce6ba965dc49	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 25 2015, 1:16 PM
52386c4d18a4	f009945ec336	7976008c4eb0 31219415d6c5	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 24 2015, 7:38 PM
7976008c4eb0	d59418691f5d	f67c13dd3ff4 d036ad552faf	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 24 2015, 10:54 AM
f67c13dd3ff4	7de33174e862	9577cc57c8b0 e40387b1e2af	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 23 2015, 1:01 PM
9577cc57c8b0	6d2b9a11489a	588e3d860280 7165db53f266	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 21 2015, 7:16 PM
588e3d860280	8ad82ac96c8c	59cf576039a5 4a4297ba02a8	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 19 2015, 10:02 PM
59cf576039a5	3e63c861d233	927d3d951b14 119ff676e1b3	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 17 2015, 7:46 PM
927d3d951b14	0a068210861d	acf22dd8ca71 3d503ea8d6fa	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 13 2015, 11:19 PM
acf22dd8ca71	bd05dd4f1636	d12d5c18c83f ab3f037ccc3f	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init (Show More…)	Jan 10 2015, 4:28 PM
d12d5c18c83f	fe703057e3e6	b8415372ca42 22ce525bcd4f	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 5 2015, 5:58 PM
b8415372ca42	b52506a4ae80	b5ec2d60e915 89b654dc56b3	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 5 2015, 1:30 PM
b5ec2d60e915	9a63149cc8d0	e03efc9d7d2c d8b00a3bf5c1	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 3 2015, 9:38 PM
e03efc9d7d2c	b6e82be9dedd	da6dab61dfbb f06335e12f0a	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 3 2015, 7:56 AM
da6dab61dfbb	721d3b572e88	5e9dbec7dee5 4bdd4aa63371	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Jan 1 2015, 12:13 PM
5e9dbec7dee5	a4a4213d63fe	dbc6b80fecb0 7f356c20dce0	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Dec 31 2014, 5:43 PM
dbc6b80fecb0	129241687320	e0b308bcdd7b 784517dfb965	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Dec 31 2014, 11:51 AM
e0b308bcdd7b	9c103a274a31	a04bb56e5018 936604e80104	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Dec 29 2014, 11:08 AM
a04bb56e5018	23988e04d3f1	3306bc3bdb3b cf178f71ac47	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init (Show More…)	Dec 26 2014, 3:11 PM
3306bc3bdb3b	80e137d697c8	df80921c5ba2 1fe7b84c7334	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Dec 21 2014, 1:40 PM
df80921c5ba2	0b2a1ce94716	71ab97ac591c 93c4ba7b70dd	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Dec 20 2014, 11:03 AM
71ab97ac591c	3efb6bbd87c9	5249fa42bfed 7a04c7f6d02a	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Dec 19 2014, 10:11 PM
5249fa42bfed	3832b0edebe8	7d3485249e7d 8627d65951b5	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Dec 18 2014, 12:21 PM
7d3485249e7d	994e4c0b2039	156ecc008819 17253bec0639	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Dec 14 2014, 2:59 PM
156ecc008819	a420de2817da	a98568c1a001 9c81833430d7	Porteries Tristan	Merge branch 'master' of git://git.blender.org/blender into init	Dec 13 2014, 8:09 PM
a98568c1a001	2b1a391bfacf	19eb700fefa3	Porteries Tristan	addons python	Dec 11 2014, 10:14 PM

BGE : Fix for T43724 and T41599 addObject() with KX_FontObject and overlay scene
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 3626

source/gameengine/GameLogic/SCA_IObject.h

source/gameengine/Ketsji/KX_FontObject.h

source/gameengine/Ketsji/KX_FontObject.cpp

source/gameengine/Ketsji/KX_Scene.cpp

BGE : Fix for T43724 and T41599 addObject() with KX_FontObject and overlay sceneClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 3626

source/gameengine/GameLogic/SCA_IObject.h

source/gameengine/Ketsji/KX_FontObject.h

source/gameengine/Ketsji/KX_FontObject.cpp

source/gameengine/Ketsji/KX_Scene.cpp

BGE : Fix for T43724 and T41599 addObject() with KX_FontObject and overlay scene
ClosedPublic
Actions

Revision Contents
Changeset List