Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/editors/scene/scene_edit.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/editors/scene/scene_edit.c')
-rw-r--r--source/blender/editors/scene/scene_edit.c288
1 files changed, 145 insertions, 143 deletions
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c
index ec0a851de97..381b595171a 100644
--- a/source/blender/editors/scene/scene_edit.c
+++ b/source/blender/editors/scene/scene_edit.c
@@ -56,31 +56,30 @@
#include "WM_api.h"
#include "WM_types.h"
-
Scene *ED_scene_add(Main *bmain, bContext *C, wmWindow *win, eSceneCopyMethod method)
{
- Scene *scene_new;
+ Scene *scene_new;
- if (method == SCE_COPY_NEW) {
- scene_new = BKE_scene_add(bmain, DATA_("Scene"));
- }
- else { /* different kinds of copying */
- Scene *scene_old = WM_window_get_active_scene(win);
+ if (method == SCE_COPY_NEW) {
+ scene_new = BKE_scene_add(bmain, DATA_("Scene"));
+ }
+ else { /* different kinds of copying */
+ Scene *scene_old = WM_window_get_active_scene(win);
- scene_new = BKE_scene_copy(bmain, scene_old, method);
+ scene_new = BKE_scene_copy(bmain, scene_old, method);
- /* these can't be handled in blenkernel currently, so do them here */
- if (method == SCE_COPY_FULL) {
- ED_editors_flush_edits(bmain, false);
- ED_object_single_users(bmain, scene_new, true, true);
- }
- }
+ /* these can't be handled in blenkernel currently, so do them here */
+ if (method == SCE_COPY_FULL) {
+ ED_editors_flush_edits(bmain, false);
+ ED_object_single_users(bmain, scene_new, true, true);
+ }
+ }
- WM_window_set_active_scene(bmain, C, win, scene_new);
+ WM_window_set_active_scene(bmain, C, win, scene_new);
- WM_event_add_notifier(C, NC_SCENE | ND_SCENEBROWSE, scene_new);
+ WM_event_add_notifier(C, NC_SCENE | ND_SCENEBROWSE, scene_new);
- return scene_new;
+ return scene_new;
}
/**
@@ -89,185 +88,188 @@ Scene *ED_scene_add(Main *bmain, bContext *C, wmWindow *win, eSceneCopyMethod me
*/
bool ED_scene_delete(bContext *C, Main *bmain, wmWindow *win, Scene *scene)
{
- Scene *scene_new;
+ Scene *scene_new;
- /* kill running jobs */
- wmWindowManager *wm = bmain->wm.first;
- WM_jobs_kill_type(wm, scene, WM_JOB_TYPE_ANY);
+ /* kill running jobs */
+ wmWindowManager *wm = bmain->wm.first;
+ WM_jobs_kill_type(wm, scene, WM_JOB_TYPE_ANY);
- if (scene->id.prev)
- scene_new = scene->id.prev;
- else if (scene->id.next)
- scene_new = scene->id.next;
- else
- return false;
+ if (scene->id.prev)
+ scene_new = scene->id.prev;
+ else if (scene->id.next)
+ scene_new = scene->id.next;
+ else
+ return false;
- WM_window_set_active_scene(bmain, C, win, scene_new);
+ WM_window_set_active_scene(bmain, C, win, scene_new);
- BKE_id_delete(bmain, scene);
+ BKE_id_delete(bmain, scene);
- return true;
+ return true;
}
/* Depsgraph updates after scene becomes active in a window. */
void ED_scene_change_update(Main *bmain, Scene *scene, ViewLayer *layer)
{
- Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, layer, true);
+ Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, layer, true);
- BKE_scene_set_background(bmain, scene);
- DEG_graph_relations_update(depsgraph, bmain, scene, layer);
- DEG_on_visible_update(bmain, false);
+ BKE_scene_set_background(bmain, scene);
+ DEG_graph_relations_update(depsgraph, bmain, scene, layer);
+ DEG_on_visible_update(bmain, false);
- ED_render_engine_changed(bmain);
- ED_update_for_newframe(bmain, depsgraph);
+ ED_render_engine_changed(bmain);
+ ED_update_for_newframe(bmain, depsgraph);
}
-static bool view_layer_remove_poll(
- const Scene *scene, const ViewLayer *layer)
+static bool view_layer_remove_poll(const Scene *scene, const ViewLayer *layer)
{
- const int act = BLI_findindex(&scene->view_layers, layer);
-
- if (act == -1) {
- return false;
- }
- else if ((scene->view_layers.first == scene->view_layers.last) &&
- (scene->view_layers.first == layer))
- {
- /* ensure 1 layer is kept */
- return false;
- }
-
- return true;
+ const int act = BLI_findindex(&scene->view_layers, layer);
+
+ if (act == -1) {
+ return false;
+ }
+ else if ((scene->view_layers.first == scene->view_layers.last) &&
+ (scene->view_layers.first == layer)) {
+ /* ensure 1 layer is kept */
+ return false;
+ }
+
+ return true;
}
static void view_layer_remove_unset_nodetrees(const Main *bmain, Scene *scene, ViewLayer *layer)
{
- int act_layer_index = BLI_findindex(&scene->view_layers, layer);
+ int act_layer_index = BLI_findindex(&scene->view_layers, layer);
- for (Scene *sce = bmain->scenes.first; sce; sce = sce->id.next) {
- if (sce->nodetree) {
- BKE_nodetree_remove_layer_n(sce->nodetree, scene, act_layer_index);
- }
- }
+ for (Scene *sce = bmain->scenes.first; sce; sce = sce->id.next) {
+ if (sce->nodetree) {
+ BKE_nodetree_remove_layer_n(sce->nodetree, scene, act_layer_index);
+ }
+ }
}
-bool ED_scene_view_layer_delete(
- Main *bmain, Scene *scene, ViewLayer *layer,
- ReportList *reports)
+bool ED_scene_view_layer_delete(Main *bmain, Scene *scene, ViewLayer *layer, ReportList *reports)
{
- if (view_layer_remove_poll(scene, layer) == false) {
- if (reports) {
- BKE_reportf(reports, RPT_ERROR, "View layer '%s' could not be removed from scene '%s'",
- layer->name, scene->id.name + 2);
- }
-
- return false;
- }
-
- /* We need to unset nodetrees before removing the layer, otherwise its index will be -1. */
- view_layer_remove_unset_nodetrees(bmain, scene, layer);
-
- BLI_remlink(&scene->view_layers, layer);
- BLI_assert(BLI_listbase_is_empty(&scene->view_layers) == false);
-
- /* Remove from windows. */
- wmWindowManager *wm = bmain->wm.first;
- for (wmWindow *win = wm->windows.first; win; win = win->next) {
- if (win->scene == scene && STREQ(win->view_layer_name, layer->name)) {
- ViewLayer *first_layer = BKE_view_layer_default_view(scene);
- STRNCPY(win->view_layer_name, first_layer->name);
- }
- }
-
- BKE_view_layer_free(layer);
-
- DEG_id_tag_update(&scene->id, 0);
- DEG_relations_tag_update(bmain);
- WM_main_add_notifier(NC_SCENE | ND_LAYER | NA_REMOVED, scene);
-
- return true;
+ if (view_layer_remove_poll(scene, layer) == false) {
+ if (reports) {
+ BKE_reportf(reports,
+ RPT_ERROR,
+ "View layer '%s' could not be removed from scene '%s'",
+ layer->name,
+ scene->id.name + 2);
+ }
+
+ return false;
+ }
+
+ /* We need to unset nodetrees before removing the layer, otherwise its index will be -1. */
+ view_layer_remove_unset_nodetrees(bmain, scene, layer);
+
+ BLI_remlink(&scene->view_layers, layer);
+ BLI_assert(BLI_listbase_is_empty(&scene->view_layers) == false);
+
+ /* Remove from windows. */
+ wmWindowManager *wm = bmain->wm.first;
+ for (wmWindow *win = wm->windows.first; win; win = win->next) {
+ if (win->scene == scene && STREQ(win->view_layer_name, layer->name)) {
+ ViewLayer *first_layer = BKE_view_layer_default_view(scene);
+ STRNCPY(win->view_layer_name, first_layer->name);
+ }
+ }
+
+ BKE_view_layer_free(layer);
+
+ DEG_id_tag_update(&scene->id, 0);
+ DEG_relations_tag_update(bmain);
+ WM_main_add_notifier(NC_SCENE | ND_LAYER | NA_REMOVED, scene);
+
+ return true;
}
static int scene_new_exec(bContext *C, wmOperator *op)
{
- Main *bmain = CTX_data_main(C);
- wmWindow *win = CTX_wm_window(C);
- int type = RNA_enum_get(op->ptr, "type");
+ Main *bmain = CTX_data_main(C);
+ wmWindow *win = CTX_wm_window(C);
+ int type = RNA_enum_get(op->ptr, "type");
- ED_scene_add(bmain, C, win, type);
+ ED_scene_add(bmain, C, win, type);
- return OPERATOR_FINISHED;
+ return OPERATOR_FINISHED;
}
static void SCENE_OT_new(wmOperatorType *ot)
{
- static EnumPropertyItem type_items[] = {
- {SCE_COPY_NEW, "NEW", 0, "New",
- "Add a new, empty scene with default settings"},
- {SCE_COPY_EMPTY, "EMPTY", 0, "Copy Settings",
- "Add a new, empty scene, and copy settings from the current scene"},
- {SCE_COPY_LINK_COLLECTION, "LINK_COPY", 0, "Linked Copy",
- "Link in the collections from the current scene (shallow copy)"},
- {SCE_COPY_FULL, "FULL_COPY", 0, "Full Copy",
- "Make a full copy of the current scene"},
- {0, NULL, 0, NULL, NULL},
- };
-
- /* identifiers */
- ot->name = "New Scene";
- ot->description = "Add new scene by type";
- ot->idname = "SCENE_OT_new";
-
- /* api callbacks */
- ot->exec = scene_new_exec;
- ot->invoke = WM_menu_invoke;
-
- /* flags */
- ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
- /* properties */
- ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "");
+ static EnumPropertyItem type_items[] = {
+ {SCE_COPY_NEW, "NEW", 0, "New", "Add a new, empty scene with default settings"},
+ {SCE_COPY_EMPTY,
+ "EMPTY",
+ 0,
+ "Copy Settings",
+ "Add a new, empty scene, and copy settings from the current scene"},
+ {SCE_COPY_LINK_COLLECTION,
+ "LINK_COPY",
+ 0,
+ "Linked Copy",
+ "Link in the collections from the current scene (shallow copy)"},
+ {SCE_COPY_FULL, "FULL_COPY", 0, "Full Copy", "Make a full copy of the current scene"},
+ {0, NULL, 0, NULL, NULL},
+ };
+
+ /* identifiers */
+ ot->name = "New Scene";
+ ot->description = "Add new scene by type";
+ ot->idname = "SCENE_OT_new";
+
+ /* api callbacks */
+ ot->exec = scene_new_exec;
+ ot->invoke = WM_menu_invoke;
+
+ /* flags */
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+ /* properties */
+ ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "");
}
static bool scene_delete_poll(bContext *C)
{
- Scene *scene = CTX_data_scene(C);
- return (scene->id.prev || scene->id.next);
+ Scene *scene = CTX_data_scene(C);
+ return (scene->id.prev || scene->id.next);
}
static int scene_delete_exec(bContext *C, wmOperator *UNUSED(op))
{
- Scene *scene = CTX_data_scene(C);
+ Scene *scene = CTX_data_scene(C);
- if (ED_scene_delete(C, CTX_data_main(C), CTX_wm_window(C), scene) == false) {
- return OPERATOR_CANCELLED;
- }
+ if (ED_scene_delete(C, CTX_data_main(C), CTX_wm_window(C), scene) == false) {
+ return OPERATOR_CANCELLED;
+ }
- if (G.debug & G_DEBUG)
- printf("scene delete %p\n", scene);
+ if (G.debug & G_DEBUG)
+ printf("scene delete %p\n", scene);
- WM_event_add_notifier(C, NC_SCENE | NA_REMOVED, scene);
+ WM_event_add_notifier(C, NC_SCENE | NA_REMOVED, scene);
- return OPERATOR_FINISHED;
+ return OPERATOR_FINISHED;
}
static void SCENE_OT_delete(wmOperatorType *ot)
{
- /* identifiers */
- ot->name = "Delete Scene";
- ot->description = "Delete active scene";
- ot->idname = "SCENE_OT_delete";
+ /* identifiers */
+ ot->name = "Delete Scene";
+ ot->description = "Delete active scene";
+ ot->idname = "SCENE_OT_delete";
- /* api callbacks */
- ot->exec = scene_delete_exec;
- ot->poll = scene_delete_poll;
+ /* api callbacks */
+ ot->exec = scene_delete_exec;
+ ot->poll = scene_delete_poll;
- /* flags */
- ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+ /* flags */
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
void ED_operatortypes_scene(void)
{
- WM_operatortype_append(SCENE_OT_new);
- WM_operatortype_append(SCENE_OT_delete);
+ WM_operatortype_append(SCENE_OT_new);
+ WM_operatortype_append(SCENE_OT_delete);
}