archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup/refactor: no new general arg-less macros enforcing var names please!

Browse Source 
We do have an history of those pieces of evil in our code, would be nice
to get fully rid of it, but at the very least let's not add more of them
in new code. :)
This commit is contained in:
Bastien Montagne
2017-08-15 15:59:38 +02:00
parent 90d80ddaa2
commit 77497175fa
54 changed files with 161 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/object/object_edit.c
View File

@@ -545,8 +545,8 @@ static void copymenu_properties(SceneLayer *sl, Object *ob)
nr = pupmenu(str);
if (nr == 1 || nr == 2) {
for (base = FIRSTBASE_NEW; base; base = base->next) {
if ((base != BASACT_NEW) && (TESTBASELIB_NEW(base))) {
for (base = FIRSTBASE_NEW(sl); base; base = base->next) {
if ((base != BASACT_NEW(sl)) && (TESTBASELIB_NEW(base))) {
if (nr == 1) { /* replace */
BKE_bproperty_copy_list(&base->object->prop, &ob->prop);
}
@@ -562,8 +562,8 @@ static void copymenu_properties(SceneLayer *sl, Object *ob)
prop = BLI_findlink(&ob->prop, nr - 4); /* account for first 3 menu items & menu index starting at 1*/
if (prop) {
for (base = FIRSTBASE_NEW; base; base = base->next) {
if ((base != BASACT_NEW) && (TESTBASELIB_NEW(base))) {
for (base = FIRSTBASE_NEW(sl); base; base = base->next) {
if ((base != BASACT_NEW(sl)) && (TESTBASELIB_NEW(base))) {
BKE_bproperty_object_set(base->object, prop);
}
}
@@ -578,7 +578,7 @@ static void copymenu_logicbricks(SceneLayer *sl, Object *ob)
//XXX no longer used - to be removed - replaced by logicbricks_copy_exec
Base *base;
for (base = FIRSTBASE_NEW; base; base = base->next) {
for (base = FIRSTBASE_NEW(sl); base; base = base->next) {
if (base->object != ob) {
if (TESTBASELIB_NEW(base)) {
@@ -669,7 +669,7 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
if (ID_IS_LINKED_DATABLOCK(scene)) return;
if (!(ob = OBACT_NEW)) return;
if (!(ob = OBACT_NEW(sl))) return;
if (scene->obedit) { // XXX get from context
/* obedit_copymenu(); */
@@ -689,8 +689,8 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
return;
}
for (base = FIRSTBASE_NEW; base; base = base->next) {
if (base != BASACT_NEW) {
for (base = FIRSTBASE_NEW(sl); base; base = base->next) {
if (base != BASACT_NEW(sl)) {
if (TESTBASELIB_NEW(base)) {
DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
@@ -916,7 +916,7 @@ static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, SceneLay
short event;
char str[512];
if (!(ob = OBACT_NEW)) return;
if (!(ob = OBACT_NEW(sl))) return;
if (scene->obedit) { /* XXX get from context */
/* if (ob->type == OB_MESH) */
@@ -1341,7 +1341,7 @@ static void UNUSED_FUNCTION(image_aspect) (Scene *scene, SceneLayer *sl)
if (scene->obedit) return; // XXX get from context
if (ID_IS_LINKED_DATABLOCK(scene)) return;
for (base = FIRSTBASE_NEW; base; base = base->next) {
for (base = FIRSTBASE_NEW(sl); base; base = base->next) {
if (TESTBASELIB_NEW(base)) {
ob = base->object;
done = false;