Commit: dd0de53d29681987baca8ac1a9e1011c11402685
Author: Bastien Montagne
Date: Tue Sep 27 17:55:12 2016 +0200
Branches: master
https://developer.blender.org/rBdd0de53d29681987baca8ac1a9e1011c11402685
Fix T49466: Stupid typo in logicbricks new copy code from rB776a8548f03a
Moved that code forth and back a few times while creating rB776a8548f03a fix,
ended up forgetting to update it correctly for function where it layed down in
the end.
Last-minute fixes are never a good thing... Now we already have real reason for
2.78 'a' release :(
===================================================================
M source/blender/blenkernel/intern/sca.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sca.c
b/source/blender/blenkernel/intern/sca.c
index 61aa8c7..c7f4060 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -789,7 +789,7 @@ void BKE_sca_logic_copy(Object *ob_new, Object *ob)
copy_controllers(&ob_new->controllers, &ob->controllers);
copy_actuators(&ob_new->actuators, &ob->actuators);
- for (bSensor *sens = ob->sensors.first; sens; sens = sens->next) {
+ for (bSensor *sens = ob_new->sensors.first; sens; sens = sens->next) {
if (sens->flag & SENS_NEW) {
for (int a = 0; a < sens->totlinks; a++) {
if (sens->links[a] && sens->links[a]->mynew) {
@@ -799,7 +799,7 @@ void BKE_sca_logic_copy(Object *ob_new, Object *ob)
}
}
- for (bController *cont = ob->controllers.first; cont; cont =
cont->next) {
+ for (bController *cont = ob_new->controllers.first; cont; cont =
cont->next) {
if (cont->flag & CONT_NEW) {
for (int a = 0; a < cont->totlinks; a++) {
if (cont->links[a] && cont->links[a]->mynew) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
